zeroc-ice 3.7.0 → 3.7.1

data/ext/ice/cpp/src/Ice/EndpointF.cpp

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 //
-// Ice version 3.7.0
+// Ice version 3.7.1
 //
 // <auto-generated>
 //
@@ -40,7 +40,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 0
+#   if ICE_INT_VERSION % 100 < 1
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/src/Ice/EndpointFactory.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/EndpointFactory.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/EndpointFactoryF.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/EndpointFactoryManager.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -81,16 +81,12 @@ IceInternal::EndpointFactoryManager::create(const string& str, bool oaEndpoint)
     bool b = IceUtilInternal::splitString(str, " \t\n\r", v);
     if(!b)
     {
-        EndpointParseException ex(__FILE__, __LINE__);
-        ex.str = "mismatched quote";
-        throw ex;
+        throw EndpointParseException(__FILE__, __LINE__, "mismatched quote");
     }
 
     if(v.empty())
     {
-        EndpointParseException ex(__FILE__, __LINE__);
-        ex.str = "value has no non-whitespace characters";
-        throw ex;
+        throw EndpointParseException(__FILE__, __LINE__, "value has no non-whitespace characters");
     }
 
     string protocol = v.front();
@@ -123,9 +119,8 @@ IceInternal::EndpointFactoryManager::create(const string& str, bool oaEndpoint)
         EndpointIPtr e = factory->create(v, oaEndpoint);
         if(!v.empty())
         {
-            EndpointParseException ex(__FILE__, __LINE__);
-            ex.str = "unrecognized argument `" + v.front() + "' in endpoint `" + str + "'";
-            throw ex;
+            throw EndpointParseException(__FILE__, __LINE__, "unrecognized argument `" + v.front() +
+                                         "' in endpoint `" + str + "'");
         }
         return e;
 #else
@@ -153,9 +148,8 @@ IceInternal::EndpointFactoryManager::create(const string& str, bool oaEndpoint)
         EndpointIPtr ue = ICE_MAKE_SHARED(OpaqueEndpointI, v);
         if(!v.empty())
         {
-            EndpointParseException ex(__FILE__, __LINE__);
-            ex.str = "unrecognized argument `" + v.front() + "' in endpoint `" + str + "'";
-            throw ex;
+            throw EndpointParseException(__FILE__, __LINE__, "unrecognized argument `" + v.front() + "' in endpoint `" +
+                                         str + "'");
         }
         factory = get(ue->type());
         if(factory)

data/ext/ice/cpp/src/Ice/EndpointFactoryManager.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/EndpointFactoryManagerF.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/EndpointI.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -31,7 +31,7 @@ IceInternal::EndpointI::streamWrite(Ice::OutputStream* s) const
 }
 
 string
-IceInternal::EndpointI::toString() const
+IceInternal::EndpointI::toString() const ICE_NOEXCEPT
 {
     //
     // WARNING: Certain features, such as proxy validation in Glacier2,

data/ext/ice/cpp/src/Ice/EndpointI.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -164,7 +164,7 @@ public:
     //
     virtual std::string options() const = 0;
 
-    virtual std::string toString() const;
+    virtual std::string toString() const ICE_NOEXCEPT;
     void initWithOptions(std::vector<std::string>&);
 
 protected:
@@ -196,19 +196,19 @@ public:
     }
 
     virtual Ice::Short
-    type() const
+    type() const ICE_NOEXCEPT
     {
         return _endpoint->type();
     }
 
     virtual bool
-    datagram() const
+    datagram() const ICE_NOEXCEPT
     {
         return _endpoint->datagram();
     }
 
     virtual bool
-    secure() const
+    secure() const ICE_NOEXCEPT
     {
         return _endpoint->secure();
     }

data/ext/ice/cpp/src/Ice/EndpointIF.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/EndpointTypes.cpp

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 //
-// Ice version 3.7.0
+// Ice version 3.7.1
 //
 // <auto-generated>
 //
@@ -40,7 +40,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 0
+#   if ICE_INT_VERSION % 100 < 1
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/src/Ice/EventHandler.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/EventHandler.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/EventHandlerF.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/Exception.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/FacetMap.cpp

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 //
-// Ice version 3.7.0
+// Ice version 3.7.1
 //
 // <auto-generated>
 //
@@ -42,7 +42,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 0
+#   if ICE_INT_VERSION % 100 < 1
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/src/Ice/FactoryTable.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/FactoryTableInit.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/GCObject.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/HashUtil.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/HttpParser.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/HttpParser.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/IPEndpointI.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -61,25 +61,25 @@ IceInternal::IPEndpointInfoI::~IPEndpointInfoI()
 }
 
 Ice::Short
-IceInternal::IPEndpointInfoI::type() const
+IceInternal::IPEndpointInfoI::type() const ICE_NOEXCEPT
 {
     return _endpoint->type();
 }
 
 bool
-IceInternal::IPEndpointInfoI::datagram() const
+IceInternal::IPEndpointInfoI::datagram() const ICE_NOEXCEPT
 {
     return _endpoint->datagram();
 }
 
 bool
-IceInternal::IPEndpointInfoI::secure() const
+IceInternal::IPEndpointInfoI::secure() const ICE_NOEXCEPT
 {
     return _endpoint->secure();
 }
 
 Ice::EndpointInfoPtr
-IceInternal::IPEndpointI::getInfo() const
+IceInternal::IPEndpointI::getInfo() const ICE_NOEXCEPT
 {
     Ice::IPEndpointInfoPtr info = ICE_MAKE_SHARED(IPEndpointInfoI, ICE_SHARED_FROM_CONST_THIS(IPEndpointI));
     fillEndpointInfo(info.get());
@@ -426,9 +426,8 @@ IceInternal::IPEndpointI::initWithOptions(vector<string>& args, bool oaEndpoint)
         }
         else
         {
-            Ice::EndpointParseException ex(__FILE__, __LINE__);
-            ex.str = "`-h *' not valid for proxy endpoint `" + toString() + "'";
-            throw ex;
+            throw Ice::EndpointParseException(__FILE__, __LINE__, "`-h *' not valid for proxy endpoint `" + toString() +
+                                              "'");
         }
     }
 
@@ -436,9 +435,9 @@ IceInternal::IPEndpointI::initWithOptions(vector<string>& args, bool oaEndpoint)
     {
         if(oaEndpoint)
         {
-            Ice::EndpointParseException ex(__FILE__, __LINE__);
-            ex.str = "`--sourceAddress' not valid for object adapter endpoint `" + toString() + "'";
-            throw ex;
+            throw Ice::EndpointParseException(__FILE__, __LINE__,
+                                              "`--sourceAddress' not valid for object adapter endpoint `" + toString() +
+                                              "'");
         }
     }
     else if(!oaEndpoint)
@@ -454,9 +453,8 @@ IceInternal::IPEndpointI::checkOption(const string& option, const string& argume
     {
         if(argument.empty())
         {
-            Ice::EndpointParseException ex(__FILE__, __LINE__);
-            ex.str = "no argument provided for -h option in endpoint " + endpoint;
-            throw ex;
+            throw Ice::EndpointParseException(__FILE__, __LINE__, "no argument provided for -h option in endpoint " +
+                                              endpoint);
         }
         const_cast<string&>(_host) = argument;
     }
@@ -464,39 +462,36 @@ IceInternal::IPEndpointI::checkOption(const string& option, const string& argume
     {
         if(argument.empty())
         {
-            Ice::EndpointParseException ex(__FILE__, __LINE__);
-            ex.str = "no argument provided for -p option in endpoint " + endpoint;
-            throw ex;
+            throw Ice::EndpointParseException(__FILE__, __LINE__, "no argument provided for -p option in endpoint " +
+                                              endpoint);
         }
         istringstream p(argument);
         if(!(p >> const_cast<Ice::Int&>(_port)) || !p.eof())
         {
-            Ice::EndpointParseException ex(__FILE__, __LINE__);
-            ex.str = "invalid port value `" + argument + "' in endpoint " + endpoint;
-            throw ex;
+            throw Ice::EndpointParseException(__FILE__, __LINE__, "invalid port value `" + argument + "' in endpoint " +
+                                              endpoint);
         }
         else if(_port < 0 || _port > 65535)
         {
-            Ice::EndpointParseException ex(__FILE__, __LINE__);
-            ex.str = "port value `" + argument + "' out of range in endpoint " + endpoint;
-            throw ex;
+            throw Ice::EndpointParseException(__FILE__, __LINE__, "port value `" + argument +
+                                              "' out of range in endpoint " + endpoint);
         }
     }
     else if(option == "--sourceAddress")
     {
         if(argument.empty())
         {
-            Ice::EndpointParseException ex(__FILE__, __LINE__);
-            ex.str = "no argument provided for --sourceAddress option in endpoint " + endpoint;
-            throw ex;
+            throw Ice::EndpointParseException(__FILE__, __LINE__,
+                                              "no argument provided for --sourceAddress option in endpoint " +
+                                              endpoint);
         }
 #ifndef ICE_OS_UWP
         const_cast<Address&>(_sourceAddr) = getNumericAddress(argument);
         if(!isAddressValid(_sourceAddr))
         {
-            Ice::EndpointParseException ex(__FILE__, __LINE__);
-            ex.str = "invalid IP address provided for --sourceAddress option in endpoint " + endpoint;
-            throw ex;
+            throw Ice::EndpointParseException(__FILE__, __LINE__,
+                                              "invalid IP address provided for --sourceAddress option in endpoint " +
+                                              endpoint);
         }
 #endif
     }