2 files changed, 6 insertions, 12 deletions
diff --git a/cppe/src/IceE/Initialize.cpp b/cppe/src/IceE/Initialize.cpp
index dd2536e93d3..771d184dc93 100644
--- a/cppe/src/IceE/Initialize.cpp
+++ b/cppe/src/IceE/Initialize.cpp
@@ -123,7 +123,7 @@ Ice::getDefaultProperties(int& argc, char* argv[])
 }
 
 CommunicatorPtr
-Ice::initialize(int& argc, char* argv[], InitializationData initData, Int version)
+Ice::initialize(int& argc, char* argv[], const InitializationData& initData, Int version)
 {
 #ifndef ICE_IGNORE_VERSION
     //
@@ -143,16 +143,17 @@ Ice::initialize(int& argc, char* argv[], InitializationData initData, Int versio
     }
 #endif
 
-    if(!initData.properties)
+    InitializationData tmpData = initData;
+    if(!tmpData.properties)
     {
-        initData.properties = getDefaultProperties(argc, argv);
+        tmpData.properties = getDefaultProperties(argc, argv);
     }
 
     StringSeq args = argsToStringSeq(argc, argv);
-    args = initData.properties->parseIceCommandLineOptions(args);
+    args = tmpData.properties->parseIceCommandLineOptions(args);
     stringSeqToArgs(args, argc, argv);
 
-    CommunicatorPtr communicator = new Communicator(initData);
+    CommunicatorPtr communicator = new Communicator(tmpData);
     communicator->finishSetup(argc, argv);
     return communicator;
 }
diff --git a/cppe/src/IceE/ObjectAdapter.cpp b/cppe/src/IceE/ObjectAdapter.cpp
index ea2253b0c44..e6c5810ae1f 100644
--- a/cppe/src/IceE/ObjectAdapter.cpp
+++ b/cppe/src/IceE/ObjectAdapter.cpp
@@ -341,13 +341,6 @@ Ice::ObjectAdapter::waitForDeactivate()
     }
 }
 
-void
-Ice::ObjectAdapter::destroy()
-{
-    deactivate();
-    waitForDeactivate();
-}
-
 ObjectPrx
 Ice::ObjectAdapter::add(const ObjectPtr& object, const Identity& ident)
 {