Merge branch '3.7.1-xcode10' into 3.7

12 files changed, 38 insertions, 33 deletions

diff --git a/cpp/include/Ice/MetricsObserverI.h b/cpp/include/Ice/MetricsObserverI.h
index a360be048ee..728cb381b3a 100644
--- a/cpp/include/Ice/MetricsObserverI.h
+++ b/cpp/include/Ice/MetricsObserverI.h
@@ -331,7 +331,7 @@ public:
 };
 ICE_DEFINE_PTR(UpdaterPtr, Updater);
 
-template<typename T> class UpdaterT : public Updater
+template<typename T> class UpdaterT ICE_FINAL : public Updater
 {
 public:
 
diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h
index 71eb5623b82..48163dd96ab 100644
--- a/cpp/include/IceUtil/Config.h
+++ b/cpp/include/IceUtil/Config.h
@@ -119,9 +119,11 @@
 #if defined(ICE_CPP11_COMPILER) && (!defined(_MSC_VER) || (_MSC_VER >= 1900))
 #   define ICE_NOEXCEPT noexcept
 #   define ICE_NOEXCEPT_FALSE noexcept(false)
+#   define ICE_FINAL final
 #else
 #   define ICE_NOEXCEPT throw()
 #   define ICE_NOEXCEPT_FALSE /**/
+#   define ICE_FINAL /**/
 #endif
 
 //
diff --git a/cpp/src/Glacier2Lib/SessionHelper.cpp b/cpp/src/Glacier2Lib/SessionHelper.cpp
index dbd03ce40e4..633f968a707 100644
--- a/cpp/src/Glacier2Lib/SessionHelper.cpp
+++ b/cpp/src/Glacier2Lib/SessionHelper.cpp
@@ -352,7 +352,7 @@ Glacier2::SessionCallback::~SessionCallback()
 namespace
 {
 
-class ConnectStrategySecureConnection : public ConnectStrategy
+class ConnectStrategySecureConnection ICE_FINAL : public ConnectStrategy
 {
 
 public:
@@ -373,7 +373,7 @@ private:
     const map<string, string> _context;
 };
 
-class ConnectStrategyUserPassword : public ConnectStrategy
+class ConnectStrategyUserPassword ICE_FINAL : public ConnectStrategy
 {
 
 public:
diff --git a/cpp/src/Ice/ConnectRequestHandler.h b/cpp/src/Ice/ConnectRequestHandler.h
index db2e82265ba..860f8619a88 100644
--- a/cpp/src/Ice/ConnectRequestHandler.h
+++ b/cpp/src/Ice/ConnectRequestHandler.h
@@ -26,10 +26,10 @@
 namespace IceInternal
 {
 
-class ConnectRequestHandler : public RequestHandler,
-                              public Reference::GetConnectionCallback,
-                              public RouterInfo::AddProxyCallback,
-                              public IceUtil::Monitor<IceUtil::Mutex>
+class ConnectRequestHandler ICE_FINAL : public RequestHandler,
+                                        public Reference::GetConnectionCallback,
+                                        public RouterInfo::AddProxyCallback,
+                                        public IceUtil::Monitor<IceUtil::Mutex>
 #ifdef ICE_CPP11_MAPPING
                             , public std::enable_shared_from_this<ConnectRequestHandler>
 #endif
diff --git a/cpp/src/Ice/ConnectionRequestHandler.h b/cpp/src/Ice/ConnectionRequestHandler.h
index 34886aec22d..e6c9f62f37f 100644
--- a/cpp/src/Ice/ConnectionRequestHandler.h
+++ b/cpp/src/Ice/ConnectionRequestHandler.h
@@ -17,7 +17,7 @@
 namespace IceInternal
 {
 
-class ConnectionRequestHandler : public RequestHandler
+class ConnectionRequestHandler ICE_FINAL : public RequestHandler
 #ifdef ICE_CPP11_MAPPING
                                , public std::enable_shared_from_this<ConnectionRequestHandler>
 #endif
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp
index c54e62ab92d..f4b295f6b23 100644
--- a/cpp/src/Ice/Reference.cpp
+++ b/cpp/src/Ice/Reference.cpp
@@ -1625,7 +1625,7 @@ IceInternal::RoutableReference::getConnectionNoRouterInfo(const GetConnectionCal
     {
     public:
 
-        class Callback2 : public Reference::GetConnectionCallback
+        class Callback2 ICE_FINAL : public Reference::GetConnectionCallback
         {
         public:
 
diff --git a/cpp/src/IceSSL/SecureTransportCertificateI.cpp b/cpp/src/IceSSL/SecureTransportCertificateI.cpp
index 4574e811c26..cac8020a3b8 100644
--- a/cpp/src/IceSSL/SecureTransportCertificateI.cpp
+++ b/cpp/src/IceSSL/SecureTransportCertificateI.cpp
@@ -220,8 +220,8 @@ private:
 
 #endif
 
-class SecureTransportCertificateI : public IceSSL::SecureTransport::Certificate,
-                                    public IceSSL::CertificateI
+class SecureTransportCertificateI ICE_FINAL : public IceSSL::SecureTransport::Certificate,
+                                              public IceSSL::CertificateI
 {
 public:
 
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index e095a71e97e..04735a0a274 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -8307,18 +8307,21 @@ Slice::Gen::Cpp11InterfaceVisitor::visitOperation(const OperationPtr& p)
 
     if(!amd)
     {
-        writeAllocateCode(C, outParams, 0, true, classScope, _useWstring | TypeContextCpp11);
         if(p->hasMarshaledResult())
         {
             C << nl << "inS.setMarshaledResult(";
         }
-        else if(ret)
-        {
-            C << nl << retS << " ret = ";
-        }
         else
         {
-            C << nl;
+            writeAllocateCode(C, outParams, 0, true, classScope, _useWstring | TypeContextCpp11);
+            if(ret)
+            {
+                C << nl << retS << " ret = ";
+            }
+            else
+            {
+                C << nl;
+            }
         }
 
         C << "this->" << opName << spar << args << epar;
diff --git a/cpp/test/Ice/acm/AllTests.cpp b/cpp/test/Ice/acm/AllTests.cpp
index b0affe91d85..cbe654b2d4c 100644
--- a/cpp/test/Ice/acm/AllTests.cpp
+++ b/cpp/test/Ice/acm/AllTests.cpp
@@ -299,7 +299,7 @@ protected:
 };
 ICE_DEFINE_PTR(TestCasePtr, TestCase);
 
-class InvocationHeartbeatTest : public TestCase
+class InvocationHeartbeatTest ICE_FINAL : public TestCase
 {
 public:
 
@@ -318,7 +318,7 @@ public:
     }
 };
 
-class InvocationHeartbeatOnHoldTest : public TestCase
+class InvocationHeartbeatOnHoldTest ICE_FINAL : public TestCase
 {
 public:
 
@@ -348,7 +348,7 @@ public:
     }
 };
 
-class InvocationNoHeartbeatTest : public TestCase
+class InvocationNoHeartbeatTest ICE_FINAL : public TestCase
 {
 public:
 
@@ -380,7 +380,7 @@ public:
     }
 };
 
-class InvocationHeartbeatCloseOnIdleTest : public TestCase
+class InvocationHeartbeatCloseOnIdleTest ICE_FINAL : public TestCase
 {
 public:
 
@@ -402,7 +402,7 @@ public:
     }
 };
 
-class CloseOnIdleTest : public TestCase
+class CloseOnIdleTest ICE_FINAL : public TestCase
 {
 public:
 
@@ -422,7 +422,7 @@ public:
     }
 };
 
-class CloseOnInvocationTest : public TestCase
+class CloseOnInvocationTest ICE_FINAL : public TestCase
 {
 public:
 
@@ -441,7 +441,7 @@ public:
     }
 };
 
-class CloseOnIdleAndInvocationTest : public TestCase
+class CloseOnIdleAndInvocationTest ICE_FINAL : public TestCase
 {
 public:
 
@@ -473,7 +473,7 @@ public:
     }
 };
 
-class ForcefulCloseOnIdleAndInvocationTest : public TestCase
+class ForcefulCloseOnIdleAndInvocationTest ICE_FINAL : public TestCase
 {
 public:
 
@@ -495,7 +495,7 @@ public:
     }
 };
 
-class HeartbeatOnIdleTest : public TestCase
+class HeartbeatOnIdleTest ICE_FINAL : public TestCase
 {
 public:
 
@@ -513,7 +513,7 @@ public:
     }
 };
 
-class HeartbeatAlwaysTest : public TestCase
+class HeartbeatAlwaysTest ICE_FINAL : public TestCase
 {
 public:
 
@@ -535,7 +535,7 @@ public:
     }
 };
 
-class HeartbeatManualTest : public TestCase
+class HeartbeatManualTest ICE_FINAL : public TestCase
 {
 public:
 
@@ -561,7 +561,7 @@ public:
     }
 };
 
-class SetACMTest : public TestCase
+class SetACMTest ICE_FINAL : public TestCase
 {
 public:
 
diff --git a/cpp/test/Ice/acm/TestI.h b/cpp/test/Ice/acm/TestI.h
index aa8a03dbc29..1acf45fcbba 100644
--- a/cpp/test/Ice/acm/TestI.h
+++ b/cpp/test/Ice/acm/TestI.h
@@ -49,7 +49,7 @@ public:
 
 private:
 
-    class HeartbeatCallbackI :
+    class HeartbeatCallbackI ICE_FINAL :
 #ifdef ICE_CPP11_MAPPING
                                 public std::enable_shared_from_this<HeartbeatCallbackI>,
 #else
diff --git a/cpp/test/Ice/operations/BatchOneways.cpp b/cpp/test/Ice/operations/BatchOneways.cpp
index 517847e6b53..63a4e7ed63b 100644
--- a/cpp/test/Ice/operations/BatchOneways.cpp
+++ b/cpp/test/Ice/operations/BatchOneways.cpp
@@ -16,7 +16,7 @@ using namespace std;
 namespace
 {
 
-class BatchRequestInterceptorI
+class BatchRequestInterceptorI ICE_FINAL
 #ifndef ICE_CPP11_MAPPING
     : public Ice::BatchRequestInterceptor
 #endif
diff --git a/cpp/test/IceSSL/configuration/AllTests.cpp b/cpp/test/IceSSL/configuration/AllTests.cpp
index 59b0f3a519d..5955947676e 100644
--- a/cpp/test/IceSSL/configuration/AllTests.cpp
+++ b/cpp/test/IceSSL/configuration/AllTests.cpp
@@ -403,7 +403,7 @@ public:
 };
 #endif
 
-class PasswordPromptI
+class PasswordPromptI ICE_FINAL
 #ifndef ICE_CPP11_MAPPING
  : public IceSSL::PasswordPrompt
 #endif
@@ -432,7 +432,7 @@ private:
 };
 ICE_DEFINE_PTR(PasswordPromptIPtr, PasswordPromptI);
 
-class CertificateVerifierI
+class CertificateVerifierI ICE_FINAL
 #ifndef ICE_CPP11_MAPPING
 : public IceSSL::CertificateVerifier
 #endif