http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=335

1 files changed, 6 insertions, 7 deletions

diff --git a/cpp/demo/Glacier2/callback/CallbackI.cpp b/cpp/demo/Glacier2/callback/CallbackI.cpp
index 4fc13841cba..7cc2fe0289a 100644
--- a/cpp/demo/Glacier2/callback/CallbackI.cpp
+++ b/cpp/demo/Glacier2/callback/CallbackI.cpp
@@ -7,42 +7,41 @@
 //
 // **********************************************************************
 
-#include <Ice/Ice.h>
 #include <CallbackI.h>
+#include <Ice/Ice.h>
 
 using namespace std;
-using namespace Ice;
 using namespace Demo;
 
 void
-CallbackReceiverI::callback(const Current&)
+CallbackReceiverI::callback(const Ice::Current&)
 {
     cout << "received callback" << endl;
 }
 
 void
-CallbackI::initiateCallback(const CallbackReceiverPrx& proxy, const Current& current)
+CallbackI::initiateCallback(const CallbackReceiverPrx& proxy, const Ice::Current& current)
 {
     cout << "initiating callback to: " << current.adapter->getCommunicator()->proxyToString(proxy) << endl;
     try
     {
 	proxy->callback(current.ctx);
     }
-    catch(const Exception& ex)
+    catch(const Ice::Exception& ex)
     {
 	cout << ex << endl;
     }
 }
 
 void
-CallbackI::shutdown(const Current& c)
+CallbackI::shutdown(const Ice::Current& c)
 {
     cout << "shutting down..." << endl;
     try
     {
 	c.adapter->getCommunicator()->shutdown();
     }
-    catch(const Exception& ex)
+    catch(const Ice::Exception& ex)
     {
 	cout << ex << endl;
     }