4 files changed, 44 insertions, 44 deletions

diff --git a/cpp/demo/Ice/bidir/CallbackI.cpp b/cpp/demo/Ice/bidir/CallbackI.cpp
index 05c6e288d82..d24888c0dd3 100644
--- a/cpp/demo/Ice/bidir/CallbackI.cpp
+++ b/cpp/demo/Ice/bidir/CallbackI.cpp
@@ -28,15 +28,15 @@ CallbackSenderI::destroy()
     IceUtil::ThreadPtr callbackSenderThread;
 
     {
-	IceUtil::Monitor<IceUtil::Mutex>::Lock lock(*this);
-	
-	cout << "destroying callback sender" << endl;
-	_destroy = true;
-	
-	notify();
+        IceUtil::Monitor<IceUtil::Mutex>::Lock lock(*this);
+        
+        cout << "destroying callback sender" << endl;
+        _destroy = true;
+        
+        notify();
 
-	callbackSenderThread = _callbackSenderThread;
-	_callbackSenderThread = 0; // Resolve cyclic dependency.
+        callbackSenderThread = _callbackSenderThread;
+        _callbackSenderThread = 0; // Resolve cyclic dependency.
     }
 
     callbackSenderThread->getThreadControl().join();
@@ -66,27 +66,27 @@ CallbackSenderI::run()
 
     while(!_destroy)
     {
-	timedWait(IceUtil::Time::seconds(2));
+        timedWait(IceUtil::Time::seconds(2));
 
-	if(!_destroy && !_clients.empty())
-	{
-	    ++_num;
-	    
-	    set<CallbackReceiverPrx>::iterator p = _clients.begin();
-	    while(p != _clients.end())
-	    {
-		try
-		{
-		    (*p)->callback(_num);
-		    ++p;
-		}
-		catch(const Exception& ex)
-		{
-		    cerr << "removing client `" << _communicator->identityToString((*p)->ice_getIdentity()) << "':\n"
-			 << ex << endl;
-		    _clients.erase(p++);
-		}
-	    }
-	}
+        if(!_destroy && !_clients.empty())
+        {
+            ++_num;
+            
+            set<CallbackReceiverPrx>::iterator p = _clients.begin();
+            while(p != _clients.end())
+            {
+                try
+                {
+                    (*p)->callback(_num);
+                    ++p;
+                }
+                catch(const Exception& ex)
+                {
+                    cerr << "removing client `" << _communicator->identityToString((*p)->ice_getIdentity()) << "':\n"
+                         << ex << endl;
+                    _clients.erase(p++);
+                }
+            }
+        }
     }
 }
diff --git a/cpp/demo/Ice/bidir/CallbackI.h b/cpp/demo/Ice/bidir/CallbackI.h
index 2af7a28bce7..e99789bfa31 100644
--- a/cpp/demo/Ice/bidir/CallbackI.h
+++ b/cpp/demo/Ice/bidir/CallbackI.h
@@ -48,19 +48,19 @@ private:
     {
     public:
 
-	CallbackSenderThread(const CallbackSenderIPtr& callbackSender) :
-	    _callbackSender(callbackSender)
-	{
-	}
+        CallbackSenderThread(const CallbackSenderIPtr& callbackSender) :
+            _callbackSender(callbackSender)
+        {
+        }
 
-	virtual void run()
-	{
-	    _callbackSender->run();
-	}
+        virtual void run()
+        {
+            _callbackSender->run();
+        }
 
     private:
 
-	const CallbackSenderIPtr _callbackSender;
+        const CallbackSenderIPtr _callbackSender;
     };
 
     IceUtil::ThreadPtr _callbackSenderThread;
diff --git a/cpp/demo/Ice/bidir/Client.cpp b/cpp/demo/Ice/bidir/Client.cpp
index a7e8198ab45..9dbd44ab388 100644
--- a/cpp/demo/Ice/bidir/Client.cpp
+++ b/cpp/demo/Ice/bidir/Client.cpp
@@ -21,7 +21,7 @@ public:
     virtual void
     callback(Ice::Int num, const Ice::Current&)
     {
-	cout << "received callback #" << num << endl;
+        cout << "received callback #" << num << endl;
     }
 };
 
@@ -46,8 +46,8 @@ CallbackClient::run(int argc, char* argv[])
         CallbackSenderPrx::checkedCast(communicator()->propertyToProxy("Callback.Client.CallbackServer"));
     if(!server)
     {
-	cerr << appName() << ": invalid proxy" << endl;
-	return EXIT_FAILURE;
+        cerr << appName() << ": invalid proxy" << endl;
+        return EXIT_FAILURE;
     }
 
     Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("");
diff --git a/cpp/demo/Ice/bidir/Server.cpp b/cpp/demo/Ice/bidir/Server.cpp
index a311635864c..170d12ad77d 100644
--- a/cpp/demo/Ice/bidir/Server.cpp
+++ b/cpp/demo/Ice/bidir/Server.cpp
@@ -38,12 +38,12 @@ CallbackServer::run(int argc, char* argv[])
     sender->start();
     try
     {
-	communicator()->waitForShutdown();
+        communicator()->waitForShutdown();
     }
     catch(...)
     {
-	sender->destroy();
-	throw;
+        sender->destroy();
+        throw;
     }
     sender->destroy();