Fix Xcode 10 warnings

6 files changed, 19 insertions, 16 deletions

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 1e7a9be8008..8334dd233d4 100644
--- a/cpp/src/Ice/Reference.cpp
+++ b/cpp/src/Ice/Reference.cpp
@@ -1631,7 +1631,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 4bdfc7cb498..a3f3dedaf57 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -8311,18 +8311,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;