2 files changed, 28 insertions, 13 deletions
diff --git a/cpp/include/Ice/Application.h b/cpp/include/Ice/Application.h
index 0df20b71a25..57aeea57821 100644
--- a/cpp/include/Ice/Application.h
+++ b/cpp/include/Ice/Application.h
@@ -24,11 +24,17 @@ enum SignalPolicy
 #endif
 { HandleSignals, NoSignalHandling };
 
-class ICE_API Application : private IceUtil::noncopyable
+class ICE_API Application
 {
 public:
 
     Application(SignalPolicy = ICE_ENUM(SignalPolicy, HandleSignals));
+
+#ifdef ICE_CPP11_MAPPING
+    Application(const Application&) = delete;
+    Application& operator=(const Application&) = delete;
+#endif
+
     virtual ~Application();
 
     // This main() must be called by the global main(). main()
@@ -41,10 +47,10 @@ public:
     int main(int, const char* const[], const InitializationData& = InitializationData(), int = ICE_INT_VERSION);
     int main(int, const char* const[], ICE_CONFIG_FILE_STRING, int = ICE_INT_VERSION);
 
-#   ifdef _WIN32
+#ifdef _WIN32
     int main(int, const wchar_t* const[], const InitializationData& = InitializationData(), int = ICE_INT_VERSION);
     int main(int, const wchar_t* const[], ICE_CONFIG_FILE_STRING, int = ICE_INT_VERSION);
-#   endif
+#endif
 
     int main(const StringSeq&, const InitializationData& = InitializationData(), int = ICE_INT_VERSION);
     int main(const StringSeq&, ICE_CONFIG_FILE_STRING, int = ICE_INT_VERSION);
@@ -147,6 +153,15 @@ private:
     static void destroyOnInterruptCallback(int);
     static void shutdownOnInterruptCallback(int);
     static void callbackOnInterruptCallback(int);
+
+#ifndef ICE_CPP11_MAPPING
+    //
+    // Not defined, make Application non-copyable
+    //
+    Application(const Application&);
+    Application& operator=(const Application&);
+#endif
+
 };
 
 }
diff --git a/cpp/include/Ice/Initialize.h b/cpp/include/Ice/Initialize.h
index 6d1ff3b7bed..a56beb04e7b 100644
--- a/cpp/include/Ice/Initialize.h
+++ b/cpp/include/Ice/Initialize.h
@@ -205,30 +205,30 @@ public:
     CommunicatorHolder(const CommunicatorHolder&) = delete;
 
     CommunicatorHolder(CommunicatorHolder&&) = default;
-    CommunicatorHolder& operator=(CommunicatorHolder&&) = default;
+    CommunicatorHolder& operator=(CommunicatorHolder&&);
 
 #else // C++98 mapping
 
     //
     // Call initialize to create communicator with the provided args
     //
-    CommunicatorHolder(int&, const char*[], const InitializationData&, int);
+    CommunicatorHolder(int&, const char*[], const InitializationData& = InitializationData(), int = ICE_INT_VERSION);
     CommunicatorHolder(int&, char*[], const InitializationData& = InitializationData(), int = ICE_INT_VERSION);
-    CommunicatorHolder(int&, const char*[], const char* configFile, int = ICE_INT_VERSION);
-    CommunicatorHolder(int&, char*[], const char* configFile, int = ICE_INT_VERSION);
+    CommunicatorHolder(int&, const char*[], const char*, int = ICE_INT_VERSION);
+    CommunicatorHolder(int&, char*[], const char*, int = ICE_INT_VERSION);
 
 #ifdef _WIN32
     CommunicatorHolder(int&, const wchar_t*[], const InitializationData& = InitializationData(), int = ICE_INT_VERSION);
     CommunicatorHolder(int&, wchar_t*[], const InitializationData& = InitializationData(), int = ICE_INT_VERSION);
-    CommunicatorHolder(int&, const wchar_t*[], const char* configFile, int = ICE_INT_VERSION);
-    CommunicatorHolder(int&, wchar_t*[], const char* configFile, int = ICE_INT_VERSION);
+    CommunicatorHolder(int&, const wchar_t*[], const char*, int = ICE_INT_VERSION);
+    CommunicatorHolder(int&, wchar_t*[], const char*, int = ICE_INT_VERSION);
 #endif
 
-    CommunicatorHolder(StringSeq& args, const InitializationData& = InitializationData(),int = ICE_INT_VERSION);
-    CommunicatorHolder(StringSeq& args, const char* configFile, int = ICE_INT_VERSION);
+    CommunicatorHolder(StringSeq&, const InitializationData& = InitializationData(),int = ICE_INT_VERSION);
+    CommunicatorHolder(StringSeq&, const char*, int = ICE_INT_VERSION);
 
     CommunicatorHolder(const InitializationData& = InitializationData(), int = ICE_INT_VERSION);
-    CommunicatorHolder(const char* configFile, int = ICE_INT_VERSION);
+    CommunicatorHolder(const char*, int = ICE_INT_VERSION);
 
     //
     // Adopt communicator
@@ -245,8 +245,8 @@ public:
     ~CommunicatorHolder();
 
     const CommunicatorPtr& communicator() const;
-    CommunicatorPtr release();
     const CommunicatorPtr& operator->() const;
+    CommunicatorPtr release();
 
 private: