1 files changed, 3 insertions, 4 deletions
diff --git a/cpp/demo/Ice/callback/Server.cpp b/cpp/demo/Ice/callback/Server.cpp
index a476897e798..0c3b5a21581 100644
--- a/cpp/demo/Ice/callback/Server.cpp
+++ b/cpp/demo/Ice/callback/Server.cpp
@@ -7,14 +7,13 @@
 //
 // **********************************************************************
 
-#include <Ice/Application.h>
 #include <CallbackSenderI.h>
+#include <Ice/Application.h>
 
 using namespace std;
-using namespace Ice;
 using namespace Demo;
 
-class CallbackServer : public Application
+class CallbackServer : public Ice::Application
 {
 public:
 
@@ -31,7 +30,7 @@ main(int argc, char* argv[])
 int
 CallbackServer::run(int argc, char* argv[])
 {
-    ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Callback.Server");
+    Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Callback.Server");
     adapter->add(new CallbackSenderI, Ice::stringToIdentity("callback"));
     adapter->activate();
     communicator()->waitForShutdown();