1 files changed, 123 insertions, 123 deletions

diff --git a/cpp/demo/Glacier2/callback/Client.cpp b/cpp/demo/Glacier2/callback/Client.cpp
index 063ea984470..c8623250faf 100644
--- a/cpp/demo/Glacier2/callback/Client.cpp
+++ b/cpp/demo/Glacier2/callback/Client.cpp
@@ -33,16 +33,16 @@ void
 menu()
 {
     cout <<
-	"usage:\n"
-	"t: invoke callback as twoway\n"
-	"o: invoke callback as oneway\n"
-	"O: invoke callback as batch oneway\n"
-	"f: flush all batch requests\n"
-	"v: set/reset override context field\n"
-	"F: set/reset fake category\n"
-	"s: shutdown server\n"
-	"x: exit\n"
-	"?: help\n";
+        "usage:\n"
+        "t: invoke callback as twoway\n"
+        "o: invoke callback as oneway\n"
+        "O: invoke callback as batch oneway\n"
+        "f: flush all batch requests\n"
+        "v: set/reset override context field\n"
+        "F: set/reset fake category\n"
+        "s: shutdown server\n"
+        "x: exit\n"
+        "?: help\n";
 }
 
 int
@@ -57,38 +57,38 @@ CallbackClient::run(int argc, char* argv[])
     Ice::RouterPrx defaultRouter = communicator()->getDefaultRouter();
     if(!defaultRouter)
     {
-	cerr << argv[0] << ": no default router set" << endl;
-	return EXIT_FAILURE;
+        cerr << argv[0] << ": no default router set" << endl;
+        return EXIT_FAILURE;
     }
 
     Glacier2::RouterPrx router = Glacier2::RouterPrx::checkedCast(defaultRouter);
     if(!router)
     {
-	cerr << argv[0] << ": configured router is not a Glacier2 router" << endl;
-	return EXIT_FAILURE;
+        cerr << argv[0] << ": configured router is not a Glacier2 router" << endl;
+        return EXIT_FAILURE;
     }
 
     while(true)
     {
-	cout << "This demo accepts any user-id / password combination.\n";
+        cout << "This demo accepts any user-id / password combination.\n";
 
-	string id;
-	cout << "user id: " << flush;
-	cin >> id;
+        string id;
+        cout << "user id: " << flush;
+        cin >> id;
 
-	string pw;
-	cout << "password: " << flush;
-	cin >> pw;
+        string pw;
+        cout << "password: " << flush;
+        cin >> pw;
     
-	try
-	{
-	    router->createSession(id, pw);
-	    break;
-	}
-	catch(const Glacier2::PermissionDeniedException& ex)
-	{
-	    cout << "permission denied:\n" << ex.reason << endl;
-	}
+        try
+        {
+            router->createSession(id, pw);
+            break;
+        }
+        catch(const Glacier2::PermissionDeniedException& ex)
+        {
+            cout << "permission denied:\n" << ex.reason << endl;
+        }
     }
 
     Ice::Identity callbackReceiverIdent;
@@ -119,97 +119,97 @@ CallbackClient::run(int argc, char* argv[])
     char c;
     do
     {
-	try
-	{
-	    cout << "==> ";
-	    cin >> c;
-	    if(c == 't')
-	    {
-		Ice::Context context;
-		context["_fwd"] = "t";
-		if(!override.empty())
-		{
-		    context["_ovrd"] = override;
-		}
-		twoway->initiateCallback(twowayR, context);
-	    }
-	    else if(c == 'o')
-	    {
-		Ice::Context context;
-		context["_fwd"] = "o";
-		if(!override.empty())
-		{
-		    context["_ovrd"] = override;
-		}
-		oneway->initiateCallback(onewayR, context);
-	    }
-	    else if(c == 'O')
-	    {
-		Ice::Context context;
-		context["_fwd"] = "O";
-		if(!override.empty())
-		{
-		    context["_ovrd"] = override;
-		}
-		batchOneway->initiateCallback(onewayR, context);
-	    }
-	    else if(c == 'f')
-	    {
-		communicator()->flushBatchRequests();
-	    }
-	    else if(c == 'v')
-	    {
-		if(override.empty())
+        try
+        {
+            cout << "==> ";
+            cin >> c;
+            if(c == 't')
+            {
+                Ice::Context context;
+                context["_fwd"] = "t";
+                if(!override.empty())
                 {
-		    override = "some_value";
-		    cout << "override context field is now `" << override << "'" << endl;
-		}
-		else
-		{
-		    override.clear();
-		    cout << "override context field is empty" << endl;
-		}
-	    }
-	    else if(c == 'F')
-	    {
-		fake = !fake;
-
-		if(fake)
-		{
-		    twowayR = CallbackReceiverPrx::uncheckedCast(twowayR->ice_identity(callbackReceiverFakeIdent));
-		    onewayR = CallbackReceiverPrx::uncheckedCast(onewayR->ice_identity(callbackReceiverFakeIdent));
-		}
-		else
-		{
-		    twowayR = CallbackReceiverPrx::uncheckedCast(twowayR->ice_identity(callbackReceiverIdent));
-		    onewayR = CallbackReceiverPrx::uncheckedCast(onewayR->ice_identity(callbackReceiverIdent));
-		}
-		
-		cout << "callback receiver identity: " << communicator()->identityToString(twowayR->ice_getIdentity())
-		     << endl;
-	    }
-	    else if(c == 's')
-	    {
-		twoway->shutdown();
-	    }
-	    else if(c == 'x')
-	    {
-		// Nothing to do
-	    }
-	    else if(c == '?')
-	    {
-		menu();
-	    }
-	    else
-	    {
-		cout << "unknown command `" << c << "'" << endl;
-		menu();
-	    }
-	}
-	catch(const Ice::Exception& ex)
-	{
-	    cerr << ex << endl;
-	}
+                    context["_ovrd"] = override;
+                }
+                twoway->initiateCallback(twowayR, context);
+            }
+            else if(c == 'o')
+            {
+                Ice::Context context;
+                context["_fwd"] = "o";
+                if(!override.empty())
+                {
+                    context["_ovrd"] = override;
+                }
+                oneway->initiateCallback(onewayR, context);
+            }
+            else if(c == 'O')
+            {
+                Ice::Context context;
+                context["_fwd"] = "O";
+                if(!override.empty())
+                {
+                    context["_ovrd"] = override;
+                }
+                batchOneway->initiateCallback(onewayR, context);
+            }
+            else if(c == 'f')
+            {
+                communicator()->flushBatchRequests();
+            }
+            else if(c == 'v')
+            {
+                if(override.empty())
+                {
+                    override = "some_value";
+                    cout << "override context field is now `" << override << "'" << endl;
+                }
+                else
+                {
+                    override.clear();
+                    cout << "override context field is empty" << endl;
+                }
+            }
+            else if(c == 'F')
+            {
+                fake = !fake;
+
+                if(fake)
+                {
+                    twowayR = CallbackReceiverPrx::uncheckedCast(twowayR->ice_identity(callbackReceiverFakeIdent));
+                    onewayR = CallbackReceiverPrx::uncheckedCast(onewayR->ice_identity(callbackReceiverFakeIdent));
+                }
+                else
+                {
+                    twowayR = CallbackReceiverPrx::uncheckedCast(twowayR->ice_identity(callbackReceiverIdent));
+                    onewayR = CallbackReceiverPrx::uncheckedCast(onewayR->ice_identity(callbackReceiverIdent));
+                }
+                
+                cout << "callback receiver identity: " << communicator()->identityToString(twowayR->ice_getIdentity())
+                     << endl;
+            }
+            else if(c == 's')
+            {
+                twoway->shutdown();
+            }
+            else if(c == 'x')
+            {
+                // Nothing to do
+            }
+            else if(c == '?')
+            {
+                menu();
+            }
+            else
+            {
+                cout << "unknown command `" << c << "'" << endl;
+                menu();
+            }
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cerr << ex << endl;
+        }
     }
     while(cin.good() && c != 'x');
 
@@ -221,15 +221,15 @@ CallbackClient::interruptCallback(int)
 {
     try
     {
-	communicator()->destroy();
+        communicator()->destroy();
     }
     catch(const IceUtil::Exception& ex)
     {
-	cerr << appName() << ": " << ex << endl;
+        cerr << appName() << ": " << ex << endl;
     }
     catch(...)
     {
-	cerr << appName() << ": unknown exception" << endl;
+        cerr << appName() << ": unknown exception" << endl;
     }
     exit(EXIT_SUCCESS);
 }