Deprecation of global Slice definitions.

61 files changed, 165 insertions, 62 deletions

diff --git a/cpp/demo/Freeze/bench/Client.cpp b/cpp/demo/Freeze/bench/Client.cpp
index 13d1dfbd460..7f4c7586da5 100644
--- a/cpp/demo/Freeze/bench/Client.cpp
+++ b/cpp/demo/Freeze/bench/Client.cpp
@@ -15,7 +15,7 @@
 using namespace Freeze;
 using namespace Ice;
 using namespace std;
-
+using namespace Demo;
 
 static void
 testFailed(const char* expr, const char* file, unsigned int line)
diff --git a/cpp/demo/Freeze/bench/Makefile b/cpp/demo/Freeze/bench/Makefile
index c45861c9b42..9233f920a74 100644
--- a/cpp/demo/Freeze/bench/Makefile
+++ b/cpp/demo/Freeze/bench/Makefile
@@ -29,9 +29,9 @@ $(CLIENT): $(OBJS) $(COBJS)
 
 BenchTypes.h BenchTypes.cpp: Test.ice $(SLICE2FREEZE)
 	rm -f BenchTypes.h BenchTypes.cpp
-	$(SLICE2FREEZE) -I$(slicedir) --dict IntIntMap,int,int --dict Struct1Struct2Map,Struct1,Struct2 \
-	--dict Struct1Class1Map,Struct1,Class1 \
-	--dict Struct1ObjectMap,Struct1,Object BenchTypes Test.ice
+	$(SLICE2FREEZE) -I$(slicedir) --dict IntIntMap,int,int --dict Struct1Struct2Map,Demo::Struct1,Demo::Struct2 \
+	--dict Struct1Class1Map,Demo::Struct1,Demo::Class1 \
+	--dict Struct1ObjectMap,Demo::Struct1,Object BenchTypes Test.ice
 
 clean::
 	rm -f BenchTypes.h BenchTypes.cpp
diff --git a/cpp/demo/Freeze/bench/Test.ice b/cpp/demo/Freeze/bench/Test.ice
index 40dfef6a96e..23d76da8ab1 100644
--- a/cpp/demo/Freeze/bench/Test.ice
+++ b/cpp/demo/Freeze/bench/Test.ice
@@ -7,6 +7,9 @@
 //
 // **********************************************************************
 
+module Demo
+{
+
 struct Struct1
 {
     long l;
@@ -27,3 +30,5 @@ class Class2 extends Class1
     Object obj;
     Object rec;
 };
+
+};
diff --git a/cpp/demo/Freeze/library/Library.ice b/cpp/demo/Freeze/library/Library.ice
index 915aa6bff4c..b571d3d66fc 100644
--- a/cpp/demo/Freeze/library/Library.ice
+++ b/cpp/demo/Freeze/library/Library.ice
@@ -10,6 +10,9 @@
 #ifndef LIBRARY_ICE
 #define LIBRARY_ICE
 
+module Demo
+{
+
 /**
  *
  * This exception is raised in the case of a database failure.
@@ -227,4 +230,6 @@ interface Library
     idempotent void shutdown();
 };
 
+};
+
 #endif
diff --git a/cpp/demo/Freeze/library/LibraryI.cpp b/cpp/demo/Freeze/library/LibraryI.cpp
index e5188714bd7..75f36548c20 100644
--- a/cpp/demo/Freeze/library/LibraryI.cpp
+++ b/cpp/demo/Freeze/library/LibraryI.cpp
@@ -11,6 +11,7 @@
 #include <LibraryI.h>
 
 using namespace std;
+using namespace Demo;
 
 BookI::BookI(const LibraryIPtr& library) :
     _library(library), _destroyed(false)
diff --git a/cpp/demo/Freeze/library/LibraryI.h b/cpp/demo/Freeze/library/LibraryI.h
index 5eb2c8c34d6..46d17f94900 100644
--- a/cpp/demo/Freeze/library/LibraryI.h
+++ b/cpp/demo/Freeze/library/LibraryI.h
@@ -16,7 +16,7 @@
 #include <LibraryTypes.h>
 #include <IceUtil/AbstractMutex.h>
 
-class LibraryI : public Library, public IceUtil::RWRecMutex
+class LibraryI : public Demo::Library, public IceUtil::RWRecMutex
 {
 public:
 
@@ -25,13 +25,13 @@ public:
 	     const Freeze::EvictorPtr& evictor);
     virtual ~LibraryI();
 
-    virtual ::BookPrx createBook(const ::BookDescription&, const Ice::Current&);
-    virtual ::BookPrx findByIsbn(const ::std::string&, const Ice::Current&) const;
-    virtual ::BookPrxSeq findByAuthors(const ::std::string&, const Ice::Current&) const;
+    virtual ::Demo::BookPrx createBook(const ::Demo::BookDescription&, const Ice::Current&);
+    virtual ::Demo::BookPrx findByIsbn(const ::std::string&, const Ice::Current&) const;
+    virtual ::Demo::BookPrxSeq findByAuthors(const ::std::string&, const Ice::Current&) const;
     virtual void setEvictorSize(::Ice::Int, const Ice::Current&);
     virtual void shutdown(const Ice::Current&);
 
-    void remove(const BookDescription&);
+    void remove(const Demo::BookDescription&);
 
 private:
 
@@ -47,14 +47,14 @@ private:
 
 typedef IceUtil::Handle<LibraryI> LibraryIPtr;
 
-class BookI : public Book, public IceUtil::AbstractMutexReadI<IceUtil::RWRecMutex>
+class BookI : public Demo::Book, public IceUtil::AbstractMutexReadI<IceUtil::RWRecMutex>
 {
 public:
 
     BookI(const LibraryIPtr&);
     virtual ~BookI();
 
-    virtual ::BookDescription getBookDescription(const Ice::Current&) const;
+    virtual ::Demo::BookDescription getBookDescription(const Ice::Current&) const;
     virtual void destroy(const Ice::Current&);
     virtual void rentBook(const ::std::string&, const Ice::Current&);
     virtual ::std::string getRenterName(const Ice::Current&) const;
diff --git a/cpp/demo/Freeze/library/Parser.cpp b/cpp/demo/Freeze/library/Parser.cpp
index 14cce4c9550..264dc489e35 100644
--- a/cpp/demo/Freeze/library/Parser.cpp
+++ b/cpp/demo/Freeze/library/Parser.cpp
@@ -17,6 +17,7 @@
 
 using namespace std;
 using namespace Ice;
+using namespace Demo;
 
 extern FILE* yyin;
 
diff --git a/cpp/demo/Freeze/library/Parser.h b/cpp/demo/Freeze/library/Parser.h
index dbeb64016db..e58a77ce474 100644
--- a/cpp/demo/Freeze/library/Parser.h
+++ b/cpp/demo/Freeze/library/Parser.h
@@ -55,7 +55,7 @@ class Parser : public ::IceUtil::SimpleShared
 {
 public:
 
-    static ParserPtr createParser(const Ice::CommunicatorPtr&, const LibraryPrx&);
+    static ParserPtr createParser(const Ice::CommunicatorPtr&, const Demo::LibraryPrx&);
 
     void usage();
 
@@ -86,13 +86,13 @@ public:
 
 private:
 
-    Parser(const Ice::CommunicatorPtr&, const LibraryPrx&);
+    Parser(const Ice::CommunicatorPtr&, const Demo::LibraryPrx&);
 
-    BookPrxSeq _foundBooks;
-    BookPrxSeq::iterator _current;
+    Demo::BookPrxSeq _foundBooks;
+    Demo::BookPrxSeq::iterator _current;
 
     std::string _commands;
-    LibraryPrx _library;
+    Demo::LibraryPrx _library;
     bool _continue;
     int _errors;
     int _currentLine;
diff --git a/cpp/demo/Freeze/library/RunParser.cpp b/cpp/demo/Freeze/library/RunParser.cpp
index 25b938858df..053b7803962 100644
--- a/cpp/demo/Freeze/library/RunParser.cpp
+++ b/cpp/demo/Freeze/library/RunParser.cpp
@@ -11,6 +11,7 @@
 #include <Parser.h>
 
 using namespace std;
+using namespace Demo;
 
 void
 usage(const char* appName)
diff --git a/cpp/demo/Freeze/phonebook/Makefile b/cpp/demo/Freeze/phonebook/Makefile
index 4d3809a6a48..b14d87553cc 100644
--- a/cpp/demo/Freeze/phonebook/Makefile
+++ b/cpp/demo/Freeze/phonebook/Makefile
@@ -63,7 +63,7 @@ $(COLLOCATED): $(OBJS) $(COLOBJS)
 
 NameIndex.h NameIndex.cpp: PhoneBook.ice $(SLICE2FREEZE)
 	rm -f NameIndex.h NameIndex.cpp
-	$(SLICE2FREEZE) $(ICECPPFLAGS) --index NameIndex,Contact,name,case-insensitive NameIndex PhoneBook.ice
+	$(SLICE2FREEZE) $(ICECPPFLAGS) --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice
 
 clean::
 	rm -f NameIndex.h NameIndex.cpp
diff --git a/cpp/demo/Freeze/phonebook/Parser.cpp b/cpp/demo/Freeze/phonebook/Parser.cpp
index b029e5e24f4..ecb772f8a04 100644
--- a/cpp/demo/Freeze/phonebook/Parser.cpp
+++ b/cpp/demo/Freeze/phonebook/Parser.cpp
@@ -17,6 +17,7 @@
 
 using namespace std;
 using namespace Ice;
+using namespace Demo;
 
 extern FILE* yyin;
 
diff --git a/cpp/demo/Freeze/phonebook/Parser.h b/cpp/demo/Freeze/phonebook/Parser.h
index 138524b1548..b52b5c2d1c8 100644
--- a/cpp/demo/Freeze/phonebook/Parser.h
+++ b/cpp/demo/Freeze/phonebook/Parser.h
@@ -55,7 +55,7 @@ class Parser : public ::IceUtil::SimpleShared
 {
 public:
 
-    static ParserPtr createParser(const Ice::CommunicatorPtr&, const PhoneBookPrx&);
+    static ParserPtr createParser(const Ice::CommunicatorPtr&, const Demo::PhoneBookPrx&);
 
     void usage();
 
@@ -86,13 +86,13 @@ public:
 
 private:
 
-    Parser(const Ice::CommunicatorPtr&, const PhoneBookPrx&);
+    Parser(const Ice::CommunicatorPtr&, const Demo::PhoneBookPrx&);
 
-    Contacts _foundContacts;
-    Contacts::iterator _current;
+    Demo::Contacts _foundContacts;
+    Demo::Contacts::iterator _current;
 
     std::string _commands;
-    PhoneBookPrx _phoneBook;
+    Demo::PhoneBookPrx _phoneBook;
     bool _continue;
     int _errors;
     int _currentLine;
diff --git a/cpp/demo/Freeze/phonebook/PhoneBook.ice b/cpp/demo/Freeze/phonebook/PhoneBook.ice
index 06fc5a4b33a..8d4975d1377 100644
--- a/cpp/demo/Freeze/phonebook/PhoneBook.ice
+++ b/cpp/demo/Freeze/phonebook/PhoneBook.ice
@@ -12,6 +12,9 @@
 
 #include <Ice/Identity.ice>
 
+module Demo
+{
+
 exception DatabaseException
 {
     string message;
@@ -45,4 +48,6 @@ interface PhoneBook
     nonmutating void shutdown();
 };
 
+};
+
 #endif
diff --git a/cpp/demo/Freeze/phonebook/PhoneBookI.cpp b/cpp/demo/Freeze/phonebook/PhoneBookI.cpp
index 1cb31d9fabf..32a27f63fad 100644
--- a/cpp/demo/Freeze/phonebook/PhoneBookI.cpp
+++ b/cpp/demo/Freeze/phonebook/PhoneBookI.cpp
@@ -12,6 +12,7 @@
 
 using namespace std;
 using namespace Ice;
+using namespace Demo;
 
 ContactI::ContactI(const ContactFactoryPtr& contactFactory) :
     _factory(contactFactory)
diff --git a/cpp/demo/Freeze/phonebook/PhoneBookI.h b/cpp/demo/Freeze/phonebook/PhoneBookI.h
index 66594a2efc8..074a416d04d 100644
--- a/cpp/demo/Freeze/phonebook/PhoneBookI.h
+++ b/cpp/demo/Freeze/phonebook/PhoneBookI.h
@@ -23,7 +23,7 @@ typedef IceUtil::Handle<PhoneBookI> PhoneBookIPtr;
 class ContactI;
 typedef IceUtil::Handle<ContactI> ContactIPtr;
 
-class ContactI : public Contact, 
+class ContactI : public Demo::Contact, 
 		 public IceUtil::AbstractMutexReadI<IceUtil::RWRecMutex>
 {
 public:
@@ -46,14 +46,14 @@ private:
     ContactFactoryPtr _factory;
 };
 
-class PhoneBookI : public PhoneBook
+class PhoneBookI : public Demo::PhoneBook
 {
 public: 
 
     PhoneBookI(const Freeze::EvictorPtr& evictor, const ContactFactoryPtr& factory, const NameIndexPtr& index);
 
-    virtual ContactPrx createContact(const Ice::Current&);
-    virtual Contacts findContacts(const std::string&, const Ice::Current&) const;
+    virtual Demo::ContactPrx createContact(const Ice::Current&);
+    virtual Demo::Contacts findContacts(const std::string&, const Ice::Current&) const;
     virtual void setEvictorSize(Ice::Int, const Ice::Current&);
     virtual void shutdown(const Ice::Current&) const;
 
diff --git a/cpp/demo/Freeze/phonebook/RunParser.cpp b/cpp/demo/Freeze/phonebook/RunParser.cpp
index 96e227607ac..cfdef15069d 100644
--- a/cpp/demo/Freeze/phonebook/RunParser.cpp
+++ b/cpp/demo/Freeze/phonebook/RunParser.cpp
@@ -12,6 +12,7 @@
 
 using namespace std;
 using namespace Ice;
+using namespace Demo;
 
 void
 usage(const char* appName)
diff --git a/cpp/demo/Glacier/session/Client.cpp b/cpp/demo/Glacier/session/Client.cpp
index 0e58773220f..a0184adea70 100644
--- a/cpp/demo/Glacier/session/Client.cpp
+++ b/cpp/demo/Glacier/session/Client.cpp
@@ -15,6 +15,7 @@
 #include <HelloSession.h>
 
 using namespace std;
+using namespace Demo;
 
 void
 menu()
diff --git a/cpp/demo/Glacier/session/HelloSession.ice b/cpp/demo/Glacier/session/HelloSession.ice
index b4c1723bd94..140ee60222d 100644
--- a/cpp/demo/Glacier/session/HelloSession.ice
+++ b/cpp/demo/Glacier/session/HelloSession.ice
@@ -12,9 +12,14 @@
 
 #include <Glacier/Session.ice>
 
+module Demo
+{
+
 interface HelloSession extends Glacier::Session
 {
     void hello();
 };
 
+};
+
 #endif
diff --git a/cpp/demo/Glacier/session/HelloSessionI.h b/cpp/demo/Glacier/session/HelloSessionI.h
index 107d05d56df..3c2d8d30dfd 100644
--- a/cpp/demo/Glacier/session/HelloSessionI.h
+++ b/cpp/demo/Glacier/session/HelloSessionI.h
@@ -29,7 +29,7 @@ private:
 };
 typedef IceUtil::Handle<HelloSessionManagerI> HelloSessionManagerIPtr;
 
-class HelloSessionI : public HelloSession
+class HelloSessionI : public Demo::HelloSession
 {
 public:
 
diff --git a/cpp/demo/Glacier2/callback/Callback.ice b/cpp/demo/Glacier2/callback/Callback.ice
index 6138731b5c0..5041acad7c2 100644
--- a/cpp/demo/Glacier2/callback/Callback.ice
+++ b/cpp/demo/Glacier2/callback/Callback.ice
@@ -10,6 +10,9 @@
 #ifndef CALLBACK_ICE
 #define CALLBACK_ICE
 
+module Demo
+{
+
 interface CallbackReceiver
 {
     void callback();
@@ -21,4 +24,6 @@ interface Callback
     void shutdown();
 };
 
+};
+
 #endif
diff --git a/cpp/demo/Glacier2/callback/CallbackI.cpp b/cpp/demo/Glacier2/callback/CallbackI.cpp
index 9946c2bd0b9..67fa18ca671 100644
--- a/cpp/demo/Glacier2/callback/CallbackI.cpp
+++ b/cpp/demo/Glacier2/callback/CallbackI.cpp
@@ -12,6 +12,7 @@
 
 using namespace std;
 using namespace Ice;
+using namespace Demo;
 
 void
 CallbackReceiverI::callback(const Current&)
diff --git a/cpp/demo/Glacier2/callback/CallbackI.h b/cpp/demo/Glacier2/callback/CallbackI.h
index 539ab05c588..7a8d71187eb 100644
--- a/cpp/demo/Glacier2/callback/CallbackI.h
+++ b/cpp/demo/Glacier2/callback/CallbackI.h
@@ -12,18 +12,18 @@
 
 #include <Callback.h>
 
-class CallbackReceiverI : public CallbackReceiver
+class CallbackReceiverI : public Demo::CallbackReceiver
 {
 public:
 
     virtual void callback(const Ice::Current&);
 };
 
-class CallbackI : public Callback
+class CallbackI : public Demo::Callback
 {
 public:
 
-    virtual void initiateCallback(const CallbackReceiverPrx&, const Ice::Current&);
+    virtual void initiateCallback(const Demo::CallbackReceiverPrx&, const Ice::Current&);
     virtual void shutdown(const Ice::Current&);
 
 };
diff --git a/cpp/demo/Glacier2/callback/Client.cpp b/cpp/demo/Glacier2/callback/Client.cpp
index 0a0fc40fce1..3b07e161f5e 100644
--- a/cpp/demo/Glacier2/callback/Client.cpp
+++ b/cpp/demo/Glacier2/callback/Client.cpp
@@ -13,6 +13,7 @@
 
 using namespace std;
 using namespace Ice;
+using namespace Demo;
 
 class CallbackClient : public Application
 {
diff --git a/cpp/demo/Glacier2/callback/Server.cpp b/cpp/demo/Glacier2/callback/Server.cpp
index 096ab730cf6..5b9149190d0 100644
--- a/cpp/demo/Glacier2/callback/Server.cpp
+++ b/cpp/demo/Glacier2/callback/Server.cpp
@@ -12,6 +12,7 @@
 
 using namespace std;
 using namespace Ice;
+using namespace Demo;
 
 class CallbackServer : public Application
 {
diff --git a/cpp/demo/Ice/callback/Callback.ice b/cpp/demo/Ice/callback/Callback.ice
index 6138731b5c0..5041acad7c2 100644
--- a/cpp/demo/Ice/callback/Callback.ice
+++ b/cpp/demo/Ice/callback/Callback.ice
@@ -10,6 +10,9 @@
 #ifndef CALLBACK_ICE
 #define CALLBACK_ICE
 
+module Demo
+{
+
 interface CallbackReceiver
 {
     void callback();
@@ -21,4 +24,6 @@ interface Callback
     void shutdown();
 };
 
+};
+
 #endif
diff --git a/cpp/demo/Ice/callback/CallbackI.cpp b/cpp/demo/Ice/callback/CallbackI.cpp
index e8cd9053ab8..f748889a8b0 100644
--- a/cpp/demo/Ice/callback/CallbackI.cpp
+++ b/cpp/demo/Ice/callback/CallbackI.cpp
@@ -12,6 +12,7 @@
 
 using namespace std;
 using namespace Ice;
+using namespace Demo;
 
 void
 CallbackReceiverI::callback(const Current&)
diff --git a/cpp/demo/Ice/callback/CallbackI.h b/cpp/demo/Ice/callback/CallbackI.h
index 539ab05c588..7a8d71187eb 100644
--- a/cpp/demo/Ice/callback/CallbackI.h
+++ b/cpp/demo/Ice/callback/CallbackI.h
@@ -12,18 +12,18 @@
 
 #include <Callback.h>
 
-class CallbackReceiverI : public CallbackReceiver
+class CallbackReceiverI : public Demo::CallbackReceiver
 {
 public:
 
     virtual void callback(const Ice::Current&);
 };
 
-class CallbackI : public Callback
+class CallbackI : public Demo::Callback
 {
 public:
 
-    virtual void initiateCallback(const CallbackReceiverPrx&, const Ice::Current&);
+    virtual void initiateCallback(const Demo::CallbackReceiverPrx&, const Ice::Current&);
     virtual void shutdown(const Ice::Current&);
 
 };
diff --git a/cpp/demo/Ice/callback/Client.cpp b/cpp/demo/Ice/callback/Client.cpp
index eadafce336f..ab0bedd7ab9 100644
--- a/cpp/demo/Ice/callback/Client.cpp
+++ b/cpp/demo/Ice/callback/Client.cpp
@@ -12,6 +12,7 @@
 
 using namespace std;
 using namespace Ice;
+using namespace Demo;
 
 class CallbackClient : public Application
 {
diff --git a/cpp/demo/Ice/callback/Server.cpp b/cpp/demo/Ice/callback/Server.cpp
index a9616993727..53f27975527 100644
--- a/cpp/demo/Ice/callback/Server.cpp
+++ b/cpp/demo/Ice/callback/Server.cpp
@@ -12,6 +12,7 @@
 
 using namespace std;
 using namespace Ice;
+using namespace Demo;
 
 class CallbackServer : public Application
 {
diff --git a/cpp/demo/Ice/hello/Client.cpp b/cpp/demo/Ice/hello/Client.cpp
index 18aab0bb1b9..71d9a7a0bd4 100644
--- a/cpp/demo/Ice/hello/Client.cpp
+++ b/cpp/demo/Ice/hello/Client.cpp
@@ -11,6 +11,7 @@
 #include <Hello.h>
 
 using namespace std;
+using namespace Demo;
 
 void
 menu()
diff --git a/cpp/demo/Ice/hello/Hello.ice b/cpp/demo/Ice/hello/Hello.ice
index 9b532a2e9a8..4ce83cbc4c1 100644
--- a/cpp/demo/Ice/hello/Hello.ice
+++ b/cpp/demo/Ice/hello/Hello.ice
@@ -10,10 +10,15 @@
 #ifndef HELLO_ICE
 #define HELLO_ICE
 
+module Demo
+{
+
 interface Hello
 {
     nonmutating void sayHello();
     idempotent void shutdown();
 };
 
+};
+
 #endif
diff --git a/cpp/demo/Ice/hello/HelloI.h b/cpp/demo/Ice/hello/HelloI.h
index b3ca691c7e0..c3391f86903 100644
--- a/cpp/demo/Ice/hello/HelloI.h
+++ b/cpp/demo/Ice/hello/HelloI.h
@@ -12,7 +12,7 @@
 
 #include <Hello.h>
 
-class HelloI : public Hello
+class HelloI : public ::Demo::Hello
 {
 public:
 
diff --git a/cpp/demo/Ice/latency/Client.cpp b/cpp/demo/Ice/latency/Client.cpp
index 4cfbea32ef0..0e304efdedb 100644
--- a/cpp/demo/Ice/latency/Client.cpp
+++ b/cpp/demo/Ice/latency/Client.cpp
@@ -11,6 +11,7 @@
 #include <Latency.h>
 
 using namespace std;
+using namespace Demo;
 
 int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
diff --git a/cpp/demo/Ice/latency/Latency.ice b/cpp/demo/Ice/latency/Latency.ice
index 04c9673ec48..ba5af7216c7 100644
--- a/cpp/demo/Ice/latency/Latency.ice
+++ b/cpp/demo/Ice/latency/Latency.ice
@@ -10,8 +10,13 @@
 #ifndef LATENCY_ICE
 #define LATENCY_ICE
 
+module Demo
+{
+
 class Ping
 {
 };
 
+};
+
 #endif
diff --git a/cpp/demo/Ice/latency/Server.cpp b/cpp/demo/Ice/latency/Server.cpp
index 99de254a0f7..b6dbe3a922a 100644
--- a/cpp/demo/Ice/latency/Server.cpp
+++ b/cpp/demo/Ice/latency/Server.cpp
@@ -11,6 +11,7 @@
 #include <Latency.h>
 
 using namespace std;
+using namespace Demo;
 
 int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
diff --git a/cpp/demo/Ice/nested/Client.cpp b/cpp/demo/Ice/nested/Client.cpp
index 872c71436bc..6d02cd01cbb 100644
--- a/cpp/demo/Ice/nested/Client.cpp
+++ b/cpp/demo/Ice/nested/Client.cpp
@@ -12,6 +12,7 @@
 
 using namespace std;
 using namespace Ice;
+using namespace Demo;
 
 class NestedClient : public Application
 {
diff --git a/cpp/demo/Ice/nested/Nested.ice b/cpp/demo/Ice/nested/Nested.ice
index 916d80d0a12..4216d412f11 100644
--- a/cpp/demo/Ice/nested/Nested.ice
+++ b/cpp/demo/Ice/nested/Nested.ice
@@ -10,9 +10,14 @@
 #ifndef NESTED_ICE
 #define NESTED_ICE
 
+module Demo
+{
+
 interface Nested
 {
     void nestedCall(int level, Nested* proxy);
 };
 
+};
+
 #endif
diff --git a/cpp/demo/Ice/nested/NestedI.cpp b/cpp/demo/Ice/nested/NestedI.cpp
index 55b84e6e370..52e29ddec31 100644
--- a/cpp/demo/Ice/nested/NestedI.cpp
+++ b/cpp/demo/Ice/nested/NestedI.cpp
@@ -12,6 +12,7 @@
 
 using namespace std;
 using namespace Ice;
+using namespace Demo;
 
 NestedI::NestedI(const NestedPrx& self) :
     _self(self)
diff --git a/cpp/demo/Ice/nested/NestedI.h b/cpp/demo/Ice/nested/NestedI.h
index 4ec81d2f9f0..190a2f8b3dc 100644
--- a/cpp/demo/Ice/nested/NestedI.h
+++ b/cpp/demo/Ice/nested/NestedI.h
@@ -12,16 +12,16 @@
 
 #include <Nested.h>
 
-class NestedI : public Nested
+class NestedI : public Demo::Nested
 {
 public:
 
-    NestedI(const NestedPrx&);
-    virtual void nestedCall(Ice::Int, const NestedPrx&, const Ice::Current&);
+    NestedI(const Demo::NestedPrx&);
+    virtual void nestedCall(Ice::Int, const Demo::NestedPrx&, const Ice::Current&);
 
 private:
 
-    NestedPrx _self;
+    Demo::NestedPrx _self;
 };
 
 #endif
diff --git a/cpp/demo/Ice/nested/Server.cpp b/cpp/demo/Ice/nested/Server.cpp
index e3a09b1f03b..0fc9ec2d86a 100644
--- a/cpp/demo/Ice/nested/Server.cpp
+++ b/cpp/demo/Ice/nested/Server.cpp
@@ -12,6 +12,7 @@
 
 using namespace std;
 using namespace Ice;
+using namespace Demo;
 
 class NestedServer : public Application
 {
diff --git a/cpp/demo/Ice/throughput/Client.cpp b/cpp/demo/Ice/throughput/Client.cpp
index 5668c95db0c..c117be492fe 100644
--- a/cpp/demo/Ice/throughput/Client.cpp
+++ b/cpp/demo/Ice/throughput/Client.cpp
@@ -11,6 +11,7 @@
 #include <Throughput.h>
 
 using namespace std;
+using namespace Demo;
 
 void
 menu()
diff --git a/cpp/demo/Ice/throughput/Throughput.ice b/cpp/demo/Ice/throughput/Throughput.ice
index 20195e9924e..d0346f0dfd9 100644
--- a/cpp/demo/Ice/throughput/Throughput.ice
+++ b/cpp/demo/Ice/throughput/Throughput.ice
@@ -10,6 +10,9 @@
 #ifndef THROUGHPUT_ICE
 #define THROUGHPUT_ICE
 
+module Demo
+{
+
 const int seqSize = 500000;
 
 sequence<byte> ByteSeq;
@@ -21,4 +24,6 @@ interface Throughput
     ByteSeq echoByteSeq(ByteSeq seq);
 };
 
+};
+
 #endif
diff --git a/cpp/demo/Ice/throughput/ThroughputI.h b/cpp/demo/Ice/throughput/ThroughputI.h
index de7a31f69b8..ff383861e04 100644
--- a/cpp/demo/Ice/throughput/ThroughputI.h
+++ b/cpp/demo/Ice/throughput/ThroughputI.h
@@ -13,35 +13,35 @@
 #include <Ice/Ice.h>
 #include <Throughput.h>
 
-class ThroughputI : public Throughput
+class ThroughputI : public ::Demo::Throughput
 {
 public:
 
     ThroughputI() :
-	_seq(seqSize, 0)
+	_seq(::Demo::seqSize, 0)
     {
     }
 
     virtual void
-    sendByteSeq(const ByteSeq&, const Ice::Current&)
+    sendByteSeq(const ::Demo::ByteSeq&, const Ice::Current&)
     {
     }
 
-    virtual ByteSeq
+    virtual ::Demo::ByteSeq
     recvByteSeq(const Ice::Current&)
     {
 	return _seq;
     }
 
-    virtual ByteSeq
-    echoByteSeq(const ByteSeq& seq, const Ice::Current&)
+    virtual ::Demo::ByteSeq
+    echoByteSeq(const ::Demo::ByteSeq& seq, const Ice::Current&)
     {
 	return seq;
     }
 
 private:
 
-    ByteSeq _seq;
+    ::Demo::ByteSeq _seq;
 };
 
 #endif
diff --git a/cpp/demo/Ice/value/Client.cpp b/cpp/demo/Ice/value/Client.cpp
index a6adfe4b0dd..3ee1c424772 100644
--- a/cpp/demo/Ice/value/Client.cpp
+++ b/cpp/demo/Ice/value/Client.cpp
@@ -12,6 +12,7 @@
 #include <ObjectFactory.h>
 
 using namespace std;
+using namespace Demo;
 
 int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
diff --git a/cpp/demo/Ice/value/Value.ice b/cpp/demo/Ice/value/Value.ice
index b8f03f2448b..22fbecbcf17 100644
--- a/cpp/demo/Ice/value/Value.ice
+++ b/cpp/demo/Ice/value/Value.ice
@@ -10,6 +10,9 @@
 #ifndef VALUE_ICE
 #define VALUE_ICE
 
+module Demo
+{
+
 class Simple
 {
     string message;
@@ -41,4 +44,6 @@ class Initial
     void throwDerivedPrinter() throws DerivedPrinterException;
 };
 
+};
+
 #endif
diff --git a/cpp/demo/Ice/value/ValueI.cpp b/cpp/demo/Ice/value/ValueI.cpp
index 80ff5b609bc..17433b16887 100644
--- a/cpp/demo/Ice/value/ValueI.cpp
+++ b/cpp/demo/Ice/value/ValueI.cpp
@@ -11,6 +11,7 @@
 #include <ValueI.h>
 
 using namespace std;
+using namespace Demo;
 
 InitialI::InitialI(::Ice::ObjectAdapterPtr adapter)
 {
diff --git a/cpp/demo/Ice/value/ValueI.h b/cpp/demo/Ice/value/ValueI.h
index 3f656eb1297..67393d44185 100644
--- a/cpp/demo/Ice/value/ValueI.h
+++ b/cpp/demo/Ice/value/ValueI.h
@@ -12,34 +12,34 @@
 
 #include <Value.h>
 
-class InitialI : public Initial
+class InitialI : public ::Demo::Initial
 {
 public:
 
     InitialI(::Ice::ObjectAdapterPtr);
 
-    virtual SimplePtr getSimple(const Ice::Current&);
+    virtual ::Demo::SimplePtr getSimple(const Ice::Current&);
     virtual ::Ice::ObjectPtr getPrinterAsObject(const Ice::Current&);
-    virtual void getPrinter(PrinterPtr&, PrinterPrx&, const Ice::Current&);
-    virtual PrinterPtr getDerivedPrinter(const Ice::Current&);
+    virtual void getPrinter(::Demo::PrinterPtr&, ::Demo::PrinterPrx&, const Ice::Current&);
+    virtual ::Demo::PrinterPtr getDerivedPrinter(const Ice::Current&);
     virtual void throwDerivedPrinter(const Ice::Current&);
 
 private:
 
-    SimplePtr _simple;
-    PrinterPtr _printer;
-    PrinterPrx _printerProxy;
-    DerivedPrinterPtr _derivedPrinter;
+    ::Demo::SimplePtr _simple;
+    ::Demo::PrinterPtr _printer;
+    ::Demo::PrinterPrx _printerProxy;
+    ::Demo::DerivedPrinterPtr _derivedPrinter;
 };
 
-class PrinterI : virtual public Printer
+class PrinterI : virtual public ::Demo::Printer
 {
 public:
 
     virtual void printBackwards(const Ice::Current&);
 };
 
-class DerivedPrinterI : virtual public DerivedPrinter, virtual public PrinterI
+class DerivedPrinterI : virtual public ::Demo::DerivedPrinter, virtual public PrinterI
 {
 public:
 
diff --git a/cpp/demo/IceBox/hello/Client.cpp b/cpp/demo/IceBox/hello/Client.cpp
index 6cb32a985bb..aa2d5870e06 100644
--- a/cpp/demo/IceBox/hello/Client.cpp
+++ b/cpp/demo/IceBox/hello/Client.cpp
@@ -11,6 +11,7 @@
 #include <Hello.h>
 
 using namespace std;
+using namespace Demo;
 
 void
 menu()
diff --git a/cpp/demo/IceBox/hello/Hello.ice b/cpp/demo/IceBox/hello/Hello.ice
index f7344f0d112..52d80d07463 100644
--- a/cpp/demo/IceBox/hello/Hello.ice
+++ b/cpp/demo/IceBox/hello/Hello.ice
@@ -10,10 +10,15 @@
 #ifndef HELLO_ICE
 #define HELLO_ICE
 
+module Demo
+{
+
 interface Hello
 {
     void sayHello();
     void shutdown();
 };
 
+};
+
 #endif
diff --git a/cpp/demo/IceBox/hello/HelloI.h b/cpp/demo/IceBox/hello/HelloI.h
index ab98269ae92..0ea0331c33f 100644
--- a/cpp/demo/IceBox/hello/HelloI.h
+++ b/cpp/demo/IceBox/hello/HelloI.h
@@ -16,7 +16,7 @@
 #   define HELLO_API ICE_DECLSPEC_EXPORT
 #endif
 
-class HELLO_API HelloI : public Hello
+class HELLO_API HelloI : public Demo::Hello
 {
 public:
 
diff --git a/cpp/demo/IcePack/hello/Client.cpp b/cpp/demo/IcePack/hello/Client.cpp
index e787c5a9c9b..59e46f40e56 100644
--- a/cpp/demo/IcePack/hello/Client.cpp
+++ b/cpp/demo/IcePack/hello/Client.cpp
@@ -12,6 +12,7 @@
 #include <Hello.h>
 
 using namespace std;
+using namespace Demo;
 
 void
 menu()
diff --git a/cpp/demo/IcePack/hello/Hello.ice b/cpp/demo/IcePack/hello/Hello.ice
index 1fa498dd67c..19f9c3af81e 100644
--- a/cpp/demo/IcePack/hello/Hello.ice
+++ b/cpp/demo/IcePack/hello/Hello.ice
@@ -10,6 +10,9 @@
 #ifndef HELLO_ICE
 #define HELLO_ICE
 
+module Demo
+{
+
 class Hello
 {
     /**
@@ -75,4 +78,6 @@ interface HelloFactory
 	throws NameNotExistException;
 };
 
+};
+
 #endif
diff --git a/cpp/demo/IcePack/hello/HelloI.cpp b/cpp/demo/IcePack/hello/HelloI.cpp
index fd8f88729a8..0b95713079f 100644
--- a/cpp/demo/IcePack/hello/HelloI.cpp
+++ b/cpp/demo/IcePack/hello/HelloI.cpp
@@ -12,6 +12,7 @@
 #include <HelloI.h>
 
 using namespace std;
+using namespace Demo;
 
 HelloFactoryI::HelloFactoryI()
 {
diff --git a/cpp/demo/IcePack/hello/HelloI.h b/cpp/demo/IcePack/hello/HelloI.h
index c0ac7c4ed40..bdd47e2ebf4 100644
--- a/cpp/demo/IcePack/hello/HelloI.h
+++ b/cpp/demo/IcePack/hello/HelloI.h
@@ -16,15 +16,15 @@
 #   define HELLO_API ICE_DECLSPEC_EXPORT
 #endif
 
-class HELLO_API HelloFactoryI : public HelloFactory, public IceUtil::Mutex
+class HELLO_API HelloFactoryI : public Demo::HelloFactory, public IceUtil::Mutex
 {
 public:
 
     HelloFactoryI();
     
-    virtual HelloPrx create(const std::string&, const Ice::Current&);
+    virtual Demo::HelloPrx create(const std::string&, const Ice::Current&);
 
-    virtual HelloPrx find(const std::string&, const Ice::Current&) const;
+    virtual Demo::HelloPrx find(const std::string&, const Ice::Current&) const;
 
 private:
 
@@ -32,7 +32,7 @@ private:
 
 };
 
-class HELLO_API HelloI : public Hello
+class HELLO_API HelloI : public Demo::Hello
 {
 public:
 
diff --git a/cpp/demo/IcePack/simple/Client.cpp b/cpp/demo/IcePack/simple/Client.cpp
index 1d63eb1785f..c516fca9a3a 100644
--- a/cpp/demo/IcePack/simple/Client.cpp
+++ b/cpp/demo/IcePack/simple/Client.cpp
@@ -12,6 +12,7 @@
 #include <Hello.h>
 
 using namespace std;
+using namespace Demo;
 
 void
 menu()
diff --git a/cpp/demo/IcePack/simple/Hello.ice b/cpp/demo/IcePack/simple/Hello.ice
index 9b532a2e9a8..4ce83cbc4c1 100644
--- a/cpp/demo/IcePack/simple/Hello.ice
+++ b/cpp/demo/IcePack/simple/Hello.ice
@@ -10,10 +10,15 @@
 #ifndef HELLO_ICE
 #define HELLO_ICE
 
+module Demo
+{
+
 interface Hello
 {
     nonmutating void sayHello();
     idempotent void shutdown();
 };
 
+};
+
 #endif
diff --git a/cpp/demo/IcePack/simple/HelloI.h b/cpp/demo/IcePack/simple/HelloI.h
index b3ca691c7e0..9d78cbe4f50 100644
--- a/cpp/demo/IcePack/simple/HelloI.h
+++ b/cpp/demo/IcePack/simple/HelloI.h
@@ -12,7 +12,7 @@
 
 #include <Hello.h>
 
-class HelloI : public Hello
+class HelloI : public Demo::Hello
 {
 public:
 
diff --git a/cpp/demo/IceStorm/clock/Clock.ice b/cpp/demo/IceStorm/clock/Clock.ice
index 23710fdc4fd..4be4d33ab04 100644
--- a/cpp/demo/IceStorm/clock/Clock.ice
+++ b/cpp/demo/IceStorm/clock/Clock.ice
@@ -10,9 +10,14 @@
 #ifndef CLOCK_ICE
 #define CLOCK_ICE
 
+module Demo
+{
+
 interface Clock
 {
     void tick();
 };
 
+};
+
 #endif
diff --git a/cpp/demo/IceStorm/clock/ClockI.h b/cpp/demo/IceStorm/clock/ClockI.h
index 3918b942a10..6a6a386875b 100644
--- a/cpp/demo/IceStorm/clock/ClockI.h
+++ b/cpp/demo/IceStorm/clock/ClockI.h
@@ -12,7 +12,7 @@
 
 #include <Clock.h>
 
-class ClockI : public Clock
+class ClockI : public Demo::Clock
 {
 public:
 
diff --git a/cpp/demo/IceStorm/clock/Publisher.cpp b/cpp/demo/IceStorm/clock/Publisher.cpp
index 9c358d87d99..42c970832a4 100644
--- a/cpp/demo/IceStorm/clock/Publisher.cpp
+++ b/cpp/demo/IceStorm/clock/Publisher.cpp
@@ -13,6 +13,7 @@
 #include <Clock.h>
 
 using namespace std;
+using namespace Demo;
 
 class Publisher : public Ice::Application
 {
diff --git a/cpp/demo/IceStorm/clock/Subscriber.cpp b/cpp/demo/IceStorm/clock/Subscriber.cpp
index 2394b8d568e..e4387fae9de 100644
--- a/cpp/demo/IceStorm/clock/Subscriber.cpp
+++ b/cpp/demo/IceStorm/clock/Subscriber.cpp
@@ -16,6 +16,7 @@
 #include <map>
 
 using namespace std;
+using namespace Demo;
 
 class Subscriber : public Ice::Application
 {