zeroc-ice 3.6.1 → 3.6.2

data/ext/Types.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2016 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/Util.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2016 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.
@@ -378,8 +378,8 @@ IceRuby::arrayToStringSeq(VALUE val, vector<string>& seq)
     }
     for(long i = 0; i < RARRAY_LEN(arr); ++i)
     {
-        string s = getString(RARRAY_PTR(arr)[i]);
-        seq.push_back(getString(RARRAY_PTR(arr)[i]));
+        string s = getString(RARRAY_AREF(arr, i));
+        seq.push_back(getString(RARRAY_AREF(arr, i)));
     }
     return true;
 }
@@ -393,7 +393,7 @@ IceRuby::stringSeqToArray(const vector<string>& seq)
     {
         for(vector<string>::const_iterator p = seq.begin(); p != seq.end(); ++p, ++i)
         {
-            RARRAY_PTR(result)[i] = createString(*p);
+            RARRAY_ASET(result, i, createString(*p));
         }
     }
     return result;

data/ext/Util.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2016 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.
@@ -445,7 +445,7 @@ VALUE createArrayHelper(long);
 // VALUE arr = createArray(size);
 // for(long i = 0; i < size; ++i)
 // {
-//     RARRAY_PTR(arr)[i] = ...;
+//     RARRAY_ASET(arr, i, val);
 // }
 //
 template<typename T>

data/ext/extconf.rb

@@ -1,6 +1,6 @@
 # **********************************************************************
 #
-# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2016 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.
@@ -55,7 +55,7 @@ if RUBY_PLATFORM =~ /mswin|mingw/
 
 	# -lws2_32 must be in LOCAL_LIBS even though mkmk puts it at the end of the LIBS, otherwise
 	# you get error 6 when using the socket library.
-	$LOCAL_LIBS << ' -lrpcrt4  -ladvapi32 -lIphlpapi -lsecur32 -lcrypt32 -lws2_32'
+	$LOCAL_LIBS << ' -lShlwapi -lrpcrt4  -ladvapi32 -lIphlpapi -lsecur32 -lcrypt32 -lws2_32'
 
 	# statically link the C and C++ runtimes.
 	$LDFLAGS << ' -static-libgcc -static-libstdc++'

data/ext/ice/cpp/include/Ice/ACMF.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2016 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/include/Ice/Application.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2016 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/include/Ice/AsyncResult.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2016 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.
@@ -293,6 +293,11 @@ template<typename Callable, typename Callback> struct is_callable
     static const bool value = callable_type<Callable>::value == callback_type<Callback>::value;
 };
 
+//
+// COMPILERFIX: we have to use this function specialization to workaround an issue where 
+// VS2012 and GCC 4.6 can't resolve the begin_xxx overloads if we just use std::function.
+// We use some SNIFAE here to help the compiler with the overload resolution.
+//
 template<class S> class Function : public std::function<S>
 {
 

data/ext/ice/cpp/include/Ice/AsyncResultF.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2016 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/include/Ice/BasicStream.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2016 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/include/Ice/BatchRequestInterceptor.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2016 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/include/Ice/BatchRequestQueueF.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2016 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/include/Ice/Buffer.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2016 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/include/Ice/BuiltinSequences.h

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2016 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.6.1
+// Ice version 3.6.2
 //
 // <auto-generated>
 //
@@ -38,7 +38,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/include/Ice/Communicator.h

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2016 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.6.1
+// Ice version 3.6.2
 //
 // <auto-generated>
 //
@@ -55,7 +55,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -79,8 +79,6 @@ namespace Ice
 {
 
 class Communicator;
-bool operator==(const Communicator&, const Communicator&);
-bool operator<(const Communicator&, const Communicator&);
 ICE_API ::Ice::LocalObject* upCast(::Ice::Communicator*);
 typedef ::IceInternal::Handle< ::Ice::Communicator> CommunicatorPtr;
 

data/ext/ice/cpp/include/Ice/CommunicatorAsync.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2016 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/include/Ice/CommunicatorF.h

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2016 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.6.1
+// Ice version 3.6.2
 //
 // <auto-generated>
 //
@@ -38,7 +38,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -57,8 +57,6 @@ namespace Ice
 {
 
 class Communicator;
-bool operator==(const Communicator&, const Communicator&);
-bool operator<(const Communicator&, const Communicator&);
 ICE_API ::Ice::LocalObject* upCast(::Ice::Communicator*);
 typedef ::IceInternal::Handle< ::Ice::Communicator> CommunicatorPtr;
 

data/ext/ice/cpp/include/Ice/Config.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2016 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/include/Ice/Connection.h

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2016 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.6.1
+// Ice version 3.6.2
 //
 // <auto-generated>
 //
@@ -43,7 +43,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -62,44 +62,30 @@ namespace Ice
 {
 
 class ConnectionInfo;
-bool operator==(const ConnectionInfo&, const ConnectionInfo&);
-bool operator<(const ConnectionInfo&, const ConnectionInfo&);
 ICE_API ::Ice::LocalObject* upCast(::Ice::ConnectionInfo*);
 typedef ::IceInternal::Handle< ::Ice::ConnectionInfo> ConnectionInfoPtr;
 
 class Connection;
-bool operator==(const Connection&, const Connection&);
-bool operator<(const Connection&, const Connection&);
 ICE_API ::Ice::LocalObject* upCast(::Ice::Connection*);
 typedef ::IceInternal::Handle< ::Ice::Connection> ConnectionPtr;
 
 class ConnectionCallback;
-bool operator==(const ConnectionCallback&, const ConnectionCallback&);
-bool operator<(const ConnectionCallback&, const ConnectionCallback&);
 ICE_API ::Ice::LocalObject* upCast(::Ice::ConnectionCallback*);
 typedef ::IceInternal::Handle< ::Ice::ConnectionCallback> ConnectionCallbackPtr;
 
 class IPConnectionInfo;
-bool operator==(const IPConnectionInfo&, const IPConnectionInfo&);
-bool operator<(const IPConnectionInfo&, const IPConnectionInfo&);
 ICE_API ::Ice::LocalObject* upCast(::Ice::IPConnectionInfo*);
 typedef ::IceInternal::Handle< ::Ice::IPConnectionInfo> IPConnectionInfoPtr;
 
 class TCPConnectionInfo;
-bool operator==(const TCPConnectionInfo&, const TCPConnectionInfo&);
-bool operator<(const TCPConnectionInfo&, const TCPConnectionInfo&);
 ICE_API ::Ice::LocalObject* upCast(::Ice::TCPConnectionInfo*);
 typedef ::IceInternal::Handle< ::Ice::TCPConnectionInfo> TCPConnectionInfoPtr;
 
 class UDPConnectionInfo;
-bool operator==(const UDPConnectionInfo&, const UDPConnectionInfo&);
-bool operator<(const UDPConnectionInfo&, const UDPConnectionInfo&);
 ICE_API ::Ice::LocalObject* upCast(::Ice::UDPConnectionInfo*);
 typedef ::IceInternal::Handle< ::Ice::UDPConnectionInfo> UDPConnectionInfoPtr;
 
 class WSConnectionInfo;
-bool operator==(const WSConnectionInfo&, const WSConnectionInfo&);
-bool operator<(const WSConnectionInfo&, const WSConnectionInfo&);
 ICE_API ::Ice::LocalObject* upCast(::Ice::WSConnectionInfo*);
 typedef ::IceInternal::Handle< ::Ice::WSConnectionInfo> WSConnectionInfoPtr;
 
@@ -253,23 +239,13 @@ public:
     ::Ice::Int rcvSize;
 
     ::Ice::Int sndSize;
-
 protected:
 
     virtual ~ConnectionInfo() {}
 
-    friend class ConnectionInfo__staticInit;
+friend class ConnectionInfo__staticInit;
 };
 
-class ConnectionInfo__staticInit
-{
-public:
-
-    ::Ice::ConnectionInfo _init;
-};
-
-static ConnectionInfo__staticInit _ConnectionInfo_init;
-
 inline bool operator==(const ConnectionInfo& l, const ConnectionInfo& r)
 {
     return static_cast<const ::Ice::LocalObject&>(l) == static_cast<const ::Ice::LocalObject&>(r);
@@ -389,10 +365,11 @@ public:
     ::std::string remoteAddress;
 
     ::Ice::Int remotePort;
-
 protected:
 
     virtual ~IPConnectionInfo() {}
+
+friend class IPConnectionInfo__staticInit;
 };
 
 inline bool operator==(const IPConnectionInfo& l, const IPConnectionInfo& r)
@@ -422,6 +399,8 @@ public:
 
 
     virtual ~TCPConnectionInfo() {}
+
+friend class TCPConnectionInfo__staticInit;
 };
 
 inline bool operator==(const TCPConnectionInfo& l, const TCPConnectionInfo& r)
@@ -458,10 +437,11 @@ public:
     ::std::string mcastAddress;
 
     ::Ice::Int mcastPort;
-
 protected:
 
     virtual ~UDPConnectionInfo() {}
+
+friend class UDPConnectionInfo__staticInit;
 };
 
 inline bool operator==(const UDPConnectionInfo& l, const UDPConnectionInfo& r)
@@ -494,10 +474,11 @@ public:
 public:
 
     ::Ice::HeaderDict headers;
-
 protected:
 
     virtual ~WSConnectionInfo() {}
+
+friend class WSConnectionInfo__staticInit;
 };
 
 inline bool operator==(const WSConnectionInfo& l, const WSConnectionInfo& r)

data/ext/ice/cpp/include/Ice/ConnectionAsync.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2016 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/include/Ice/ConnectionF.h

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2016 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.6.1
+// Ice version 3.6.2
 //
 // <auto-generated>
 //
@@ -38,7 +38,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -57,20 +57,14 @@ namespace Ice
 {
 
 class ConnectionInfo;
-bool operator==(const ConnectionInfo&, const ConnectionInfo&);
-bool operator<(const ConnectionInfo&, const ConnectionInfo&);
 ICE_API ::Ice::LocalObject* upCast(::Ice::ConnectionInfo*);
 typedef ::IceInternal::Handle< ::Ice::ConnectionInfo> ConnectionInfoPtr;
 
 class WSConnectionInfo;
-bool operator==(const WSConnectionInfo&, const WSConnectionInfo&);
-bool operator<(const WSConnectionInfo&, const WSConnectionInfo&);
 ICE_API ::Ice::LocalObject* upCast(::Ice::WSConnectionInfo*);
 typedef ::IceInternal::Handle< ::Ice::WSConnectionInfo> WSConnectionInfoPtr;
 
 class Connection;
-bool operator==(const Connection&, const Connection&);
-bool operator<(const Connection&, const Connection&);
 ICE_API ::Ice::LocalObject* upCast(::Ice::Connection*);
 typedef ::IceInternal::Handle< ::Ice::Connection> ConnectionPtr;