summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2004-11-09 01:54:16 +0000
committerMark Spruiell <mes@zeroc.com>2004-11-09 01:54:16 +0000
commitb38c5b73561a3a9f3e56e1a445aafa23fb85b2f7 (patch)
tree70b549862d766a92821d10cc1c4d93d90640db3a /cpp
parentfixing type id (diff)
downloadice-b38c5b73561a3a9f3e56e1a445aafa23fb85b2f7.tar.bz2
ice-b38c5b73561a3a9f3e56e1a445aafa23fb85b2f7.tar.xz
ice-b38c5b73561a3a9f3e56e1a445aafa23fb85b2f7.zip
fixing type id
Diffstat (limited to 'cpp')
-rw-r--r--cpp/demo/Freeze/library/BookFactory.cpp2
-rw-r--r--cpp/demo/Freeze/library/Collocated.cpp2
-rw-r--r--cpp/demo/Freeze/phonebook/Collocated.cpp2
-rw-r--r--cpp/demo/Freeze/phonebook/ContactFactory.cpp2
4 files changed, 4 insertions, 4 deletions
diff --git a/cpp/demo/Freeze/library/BookFactory.cpp b/cpp/demo/Freeze/library/BookFactory.cpp
index d591fc6fa43..34eacb22d00 100644
--- a/cpp/demo/Freeze/library/BookFactory.cpp
+++ b/cpp/demo/Freeze/library/BookFactory.cpp
@@ -20,7 +20,7 @@ BookFactory::BookFactory(const LibraryIPtr& library) :
ObjectPtr
BookFactory::create(const string& type)
{
- assert(type == "::Book");
+ assert(type == "::Demo::Book");
return new BookI(_library);
}
diff --git a/cpp/demo/Freeze/library/Collocated.cpp b/cpp/demo/Freeze/library/Collocated.cpp
index 515a4a09497..b8c2739cdde 100644
--- a/cpp/demo/Freeze/library/Collocated.cpp
+++ b/cpp/demo/Freeze/library/Collocated.cpp
@@ -73,7 +73,7 @@ LibraryCollocated::run(int argc, char* argv[])
// Create and install a factory for books.
//
ObjectFactoryPtr bookFactory = new BookFactory(library);
- communicator()->addObjectFactory(bookFactory, "::Book");
+ communicator()->addObjectFactory(bookFactory, "::Demo::Book");
//
// Everything ok, let's go.
diff --git a/cpp/demo/Freeze/phonebook/Collocated.cpp b/cpp/demo/Freeze/phonebook/Collocated.cpp
index e73f717d15b..bbeedcaaafe 100644
--- a/cpp/demo/Freeze/phonebook/Collocated.cpp
+++ b/cpp/demo/Freeze/phonebook/Collocated.cpp
@@ -48,7 +48,7 @@ PhoneBookCollocated::run(int argc, char* argv[])
// Create and install a factory for contacts.
//
ContactFactoryPtr contactFactory = new ContactFactory();
- communicator()->addObjectFactory(contactFactory, "::Contact");
+ communicator()->addObjectFactory(contactFactory, "::Demo::Contact");
//
// Create the name index.
diff --git a/cpp/demo/Freeze/phonebook/ContactFactory.cpp b/cpp/demo/Freeze/phonebook/ContactFactory.cpp
index 40e0b3e8e9f..9e1f06c3353 100644
--- a/cpp/demo/Freeze/phonebook/ContactFactory.cpp
+++ b/cpp/demo/Freeze/phonebook/ContactFactory.cpp
@@ -21,7 +21,7 @@ ContactFactory::ContactFactory()
ObjectPtr
ContactFactory::create(const string& type)
{
- assert(type == "::Contact");
+ assert(type == "::Demo::Contact");
return new ContactI(this);
}