4 files changed, 8 insertions, 7 deletions
diff --git a/cpp/demo/Freeze/phonebook/Collocated.cpp b/cpp/demo/Freeze/phonebook/Collocated.cpp
index 8bc09ff765b..2a39e12b808 100644
--- a/cpp/demo/Freeze/phonebook/Collocated.cpp
+++ b/cpp/demo/Freeze/phonebook/Collocated.cpp
@@ -77,7 +77,7 @@ PhoneBookCollocated::runFreeze(int argc, char* argv[], const DBEnvironmentPtr& d
     // Create the phonebook, and add it to the Object Adapter.
     //
     PhoneBookIPtr phoneBook = new PhoneBookI(adapter, dbPhoneBook, evictor);
-    adapter->add(phoneBook, Ice::stringToIdentity("phonebook"));
+    adapter->add(phoneBook, stringToIdentity("phonebook"));
     
     //
     // Create and install a factory and initializer for contacts.
diff --git a/cpp/demo/Freeze/phonebook/PhoneBookI.cpp b/cpp/demo/Freeze/phonebook/PhoneBookI.cpp
index a6ea9e655c4..cc6a014df2f 100644
--- a/cpp/demo/Freeze/phonebook/PhoneBookI.cpp
+++ b/cpp/demo/Freeze/phonebook/PhoneBookI.cpp
@@ -141,7 +141,7 @@ PhoneBookI::createContact(const Ice::Current&)
     }
 
     identities.push_back(ident);
-    _nameIdentitiesDict.insert(NameIdentitiesDict::value_type("N", identities));
+    _nameIdentitiesDict.insert(make_pair(string("N"), identities));
     
     //
     // Turn the identity into a Proxy and return the Proxy to the
@@ -226,7 +226,7 @@ PhoneBookI::remove(const Identity& ident, const string& name)
 	// See the comment in getNewIdentity why the prefix "N" is
 	// needed.
 	//
-	_nameIdentitiesDict.insert(NameIdentitiesDict::value_type("N" + name, identities));
+	_nameIdentitiesDict.insert(make_pair("N" + name, identities));
     }
 }
 
@@ -247,7 +247,7 @@ PhoneBookI::move(const Identity& ident, const string& oldName, const string& new
 	identities = p->second;
     }
     identities.push_back(ident);
-    _nameIdentitiesDict.insert(NameIdentitiesDict::value_type("N" + newName, identities));
+    _nameIdentitiesDict.insert(make_pair("N" + newName, identities));
 }
 
 Identity
@@ -292,7 +292,7 @@ PhoneBookI::getNewIdentity()
     ids.clear();
     ids.push_back(id);
 
-    _nameIdentitiesDict.insert(NameIdentitiesDict::value_type("ID", ids));
+    _nameIdentitiesDict.insert(make_pair(string("ID"), ids));
 
     id.name = s;
     id.category = "contact";
diff --git a/cpp/demo/Freeze/phonebook/Server.cpp b/cpp/demo/Freeze/phonebook/Server.cpp
index b590805e2d3..fe0cd17bfda 100644
--- a/cpp/demo/Freeze/phonebook/Server.cpp
+++ b/cpp/demo/Freeze/phonebook/Server.cpp
@@ -72,7 +72,7 @@ PhoneBookServer::runFreeze(int argc, char* argv[], const DBEnvironmentPtr& dbEnv
     // Create the phonebook, and add it to the Object Adapter.
     //
     PhoneBookIPtr phoneBook = new PhoneBookI(adapter, dbPhoneBook, evictor);
-    adapter->add(phoneBook, Ice::stringToIdentity("phonebook"));
+    adapter->add(phoneBook, stringToIdentity("phonebook"));
     
     //
     // Create and install a factory and initializer for contacts.
diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp
index ae2cb2a71ed..bf6e44e148c 100644
--- a/cpp/src/Ice/Object.cpp
+++ b/cpp/src/Ice/Object.cpp
@@ -96,7 +96,7 @@ Ice::Object::___ice_ping(Incoming&, const Current& __current)
 
 const char* Ice::Object::__all[] =
 {
-    "ice_isA"
+    "ice_isA",
     "ice_ping"
 };
 
@@ -108,6 +108,7 @@ Ice::Object::__dispatch(Incoming& in, const Current& current)
     pair<const char**, const char**> r = equal_range(b, e, current.operation);
     if (r.first == r.second)
     {
+	cout << "xxx" << endl;
 	return DispatchOperationNotExist;
     }