zeroc-ice 3.6b1 → 3.6.0

data/ext/Util.h

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

@@ -27,15 +27,6 @@ if ! (RUBY_PLATFORM =~ /mswin|mingw/)
 		end
 	end
 end
-if ! File.exist?("ice/mcpp/config.h")
-	if RUBY_PLATFORM =~ /mswin|mingw/
-		FileUtils.copy("ice/mcpp/config.h.MINGW", "ice/mcpp/config.h")
-	elsif RUBY_PLATFORM =~ /linux/
-		FileUtils.copy("ice/mcpp/config.h.Linux", "ice/mcpp/config.h")
-	elsif RUBY_PLATFORM =~ /darwin/
-		FileUtils.copy("ice/mcpp/config.h.Darwin", "ice/mcpp/config.h")
-	end
-end
 
 #
 # Ice on OSX is built only with 64 bit support.
@@ -49,15 +40,15 @@ $INCFLAGS << ' -Iice/cpp/src'
 
 $CPPFLAGS << ' -DICE_STATIC_LIBS'
 
-# For mcpp.
-$CPPFLAGS << ' -DHAVE_CONFIG_H'
-
 if RUBY_PLATFORM =~ /mswin|mingw/
-	# Change -D_WIN32_WINNT=0x0501 to # Change -D_WIN32_WINNT=0x0601  otherwise the SSL plugin won't compile
+	# Change -D_WIN32_WINNT=0x0501 to # Change -D_WIN32_WINNT=0x0601 otherwise the IceSSL plugin won't compile
 	$CPPFLAGS = $CPPFLAGS.sub("501", "601")
 
 	$CPPFLAGS << ' -DWIN32_LEAN_AND_MEAN'
-	$CPPFLAGS << ' -DICE_NO_PRAGMA_COMMENT'
+	$CPPFLAGS << ' -DICE_BUILDING_ICEUTIL'
+	$CPPFLAGS << ' -DICE_BUILDING_SLICE'
+	$CPPFLAGS << ' -DICE_BUILDING_ICE'
+	$CPPFLAGS << ' -DICE_BUILDING_ICESSL'
 	$CPPFLAGS << ' -mthreads'
 
 	$INCFLAGS << ' -Iice/bzip2'
@@ -71,7 +62,18 @@ if RUBY_PLATFORM =~ /mswin|mingw/
 elsif RUBY_PLATFORM =~ /darwin/
 	$LOCAL_LIBS << ' -framework Security -framework CoreFoundation'
 elsif RUBY_PLATFORM =~ /linux/
-	$LOCAL_LIBS << ' -lssl -lcrypto'
+	$LOCAL_LIBS << ' -lssl -lcrypto -lbz2 -lrt'
+        if RUBY_VERSION =~ /1.8/
+            # With 1.8 we need to link with C++ runtime, as gcc is used to link the extension
+            $LOCAL_LIBS << ' -lstdc++'
+            # With 1.8 we need to fix the objects output directory
+            $CPPFLAGS << ' -o$@'
+            # With 1.8 /usr/lib/ruby/1.8/regex.h conflicts with /usr/include/regex.h
+            # we add a symbolic link to workaround the problem
+            if File.exist?('/usr/include/regex.h') && !File.exist?('regex.h')
+                FileUtils.ln_s '/usr/include/regex.h', 'regex.h'
+            end
+        end
 end
 $CPPFLAGS << ' -w'
 

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

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

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

@@ -0,0 +1,52 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2015 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.
+//
+// **********************************************************************
+
+#ifndef ICE_BATCH_REQUEST_INTERCEPTOR_H
+#define ICE_BATCH_REQUEST_INTERCEPTOR_H
+
+#include <IceUtil/Shared.h>
+
+#include <Ice/ProxyF.h>
+#ifdef ICE_CPP11
+#   include <functional>
+#endif
+
+namespace Ice
+{
+
+class BatchRequest
+{
+public:
+
+    virtual ~BatchRequest()
+    {
+    }
+
+    virtual void enqueue() const = 0;
+    virtual int getSize() const = 0;
+    virtual const std::string& getOperation() const = 0;
+    virtual const Ice::ObjectPrx& getProxy() const = 0;
+};
+
+class BatchRequestInterceptor : public IceUtil::Shared
+{
+public:
+
+    virtual void enqueue(const BatchRequest&, int, int) = 0;
+};
+typedef IceUtil::Handle<BatchRequestInterceptor> BatchRequestInterceptorPtr;
+
+#ifdef ICE_CPP11
+ICE_API BatchRequestInterceptorPtr
+newBatchRequestInterceptor(const ::std::function<void (const BatchRequest&, int, int)>&);
+#endif
+
+};
+
+#endif

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

@@ -0,0 +1,25 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2015 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.
+//
+// **********************************************************************
+
+#ifndef ICE_BATCH_REQUEST_QUEUE_F_H
+#define ICE_BATCH_REQUEST_QUEUE_F_H
+
+#include <IceUtil/Shared.h>
+#include <Ice/Handle.h>
+
+namespace IceInternal
+{
+
+class BatchRequestQueue;
+ICE_API IceUtil::Shared* upCast(BatchRequestQueue*);
+typedef IceInternal::Handle<BatchRequestQueue> BatchRequestQueuePtr;
+
+}
+
+#endif

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.6b
+// Ice version 3.6.0
 //
 // <auto-generated>
 //
@@ -32,14 +32,22 @@
 #include <IceUtil/UndefSysMacros.h>
 
 #ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION  != 30651
-#       error Ice version mismatch: an exact match is required for beta generated code
+#   if ICE_INT_VERSION / 100 != 306
+#       error Ice version mismatch!
+#   endif
+#   if ICE_INT_VERSION % 100 > 50
+#       error Beta header file detected
+#   endif
+#   if ICE_INT_VERSION % 100 < 0
+#       error Ice patch level mismatch!
 #   endif
 #endif
 
 #ifndef ICE_API
 #   ifdef ICE_API_EXPORTS
 #       define ICE_API ICE_DECLSPEC_EXPORT
+#   elif defined(ICE_STATIC_LIBS)
+#       define ICE_API /**/
 #   else
 #       define ICE_API ICE_DECLSPEC_IMPORT
 #   endif

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

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.6b
+// Ice version 3.6.0
 //
 // <auto-generated>
 //
@@ -49,14 +49,22 @@
 #include <IceUtil/UndefSysMacros.h>
 
 #ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION  != 30651
-#       error Ice version mismatch: an exact match is required for beta generated code
+#   if ICE_INT_VERSION / 100 != 306
+#       error Ice version mismatch!
+#   endif
+#   if ICE_INT_VERSION % 100 > 50
+#       error Beta header file detected
+#   endif
+#   if ICE_INT_VERSION % 100 < 0
+#       error Ice patch level mismatch!
 #   endif
 #endif
 
 #ifndef ICE_API
 #   ifdef ICE_API_EXPORTS
 #       define ICE_API ICE_DECLSPEC_EXPORT
+#   elif defined(ICE_STATIC_LIBS)
+#       define ICE_API /**/
 #   else
 #       define ICE_API ICE_DECLSPEC_IMPORT
 #   endif

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.6b
+// Ice version 3.6.0
 //
 // <auto-generated>
 //
@@ -32,14 +32,22 @@
 #include <IceUtil/UndefSysMacros.h>
 
 #ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION  != 30651
-#       error Ice version mismatch: an exact match is required for beta generated code
+#   if ICE_INT_VERSION / 100 != 306
+#       error Ice version mismatch!
+#   endif
+#   if ICE_INT_VERSION % 100 > 50
+#       error Beta header file detected
+#   endif
+#   if ICE_INT_VERSION % 100 < 0
+#       error Ice patch level mismatch!
 #   endif
 #endif
 
 #ifndef ICE_API
 #   ifdef ICE_API_EXPORTS
 #       define ICE_API ICE_DECLSPEC_EXPORT
+#   elif defined(ICE_STATIC_LIBS)
+#       define ICE_API /**/
 #   else
 #       define ICE_API ICE_DECLSPEC_IMPORT
 #   endif

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.
@@ -35,11 +35,14 @@
 //
 // Automatically link Ice[D].lib with Visual C++
 //
-#if defined(_MSC_VER) && !defined(ICE_NO_PRAGMA_COMMENT)
-#   if defined(ICE_STATIC_LIBS)
-#      pragma comment(lib, "Ice.lib")
-#   elif !defined(ICE_API_EXPORTS)
-#      if defined(_DEBUG)
+
+#if !defined(ICE_BUILDING_ICE) && defined(ICE_API_EXPORTS)
+#   define ICE_BUILDING_ICE
+#endif
+
+#if defined(_MSC_VER)
+#   if !defined(ICE_BUILDING_ICE)
+#      if defined(_DEBUG) && !defined(ICE_OS_WINRT)
 #          pragma comment(lib, "IceD.lib")
 #      else
 #          pragma comment(lib, "Ice.lib")
@@ -65,9 +68,11 @@ namespace IceInternal
 #ifndef ICE_API
 #   ifdef ICE_API_EXPORTS
 #       define ICE_API ICE_DECLSPEC_EXPORT
-#    else
+#   elif defined(ICE_STATIC_LIBS)
+#       define ICE_API /**/
+#   else
 #       define ICE_API ICE_DECLSPEC_IMPORT
-#    endif
+#   endif
 #endif
 
 namespace Ice

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

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.6b
+// Ice version 3.6.0
 //
 // <auto-generated>
 //
@@ -37,14 +37,22 @@
 #include <IceUtil/UndefSysMacros.h>
 
 #ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION  != 30651
-#       error Ice version mismatch: an exact match is required for beta generated code
+#   if ICE_INT_VERSION / 100 != 306
+#       error Ice version mismatch!
+#   endif
+#   if ICE_INT_VERSION % 100 > 50
+#       error Beta header file detected
+#   endif
+#   if ICE_INT_VERSION % 100 < 0
+#       error Ice patch level mismatch!
 #   endif
 #endif
 
 #ifndef ICE_API
 #   ifdef ICE_API_EXPORTS
 #       define ICE_API ICE_DECLSPEC_EXPORT
+#   elif defined(ICE_STATIC_LIBS)
+#       define ICE_API /**/
 #   else
 #       define ICE_API ICE_DECLSPEC_IMPORT
 #   endif
@@ -195,6 +203,8 @@ struct ACM
     }
 };
 
+typedef ::std::map< ::std::string, ::std::string> HeaderDict;
+
 }
 
 namespace Ice
@@ -222,10 +232,12 @@ public:
     {
     }
 
-    ConnectionInfo(bool __ice_incoming, const ::std::string& __ice_adapterName, const ::std::string& __ice_connectionId) :
+    ConnectionInfo(bool __ice_incoming, const ::std::string& __ice_adapterName, const ::std::string& __ice_connectionId, ::Ice::Int __ice_rcvSize, ::Ice::Int __ice_sndSize) :
         incoming(__ice_incoming),
         adapterName(__ice_adapterName),
-        connectionId(__ice_connectionId)
+        connectionId(__ice_connectionId),
+        rcvSize(__ice_rcvSize),
+        sndSize(__ice_sndSize)
     {
     }
 
@@ -238,6 +250,10 @@ public:
 
     ::std::string connectionId;
 
+    ::Ice::Int rcvSize;
+
+    ::Ice::Int sndSize;
+
 protected:
 
     virtual ~ConnectionInfo() {}
@@ -326,6 +342,8 @@ public:
     virtual ::std::string toString() const = 0;
 
     virtual ::Ice::ConnectionInfoPtr getInfo() const = 0;
+
+    virtual void setBufferSize(::Ice::Int, ::Ice::Int) = 0;
 };
 
 inline bool operator==(const Connection& l, const Connection& r)
@@ -352,8 +370,8 @@ public:
     {
     }
 
-    IPConnectionInfo(bool __ice_incoming, const ::std::string& __ice_adapterName, const ::std::string& __ice_connectionId, const ::std::string& __ice_localAddress, ::Ice::Int __ice_localPort, const ::std::string& __ice_remoteAddress, ::Ice::Int __ice_remotePort) :
-        ::Ice::ConnectionInfo(__ice_incoming, __ice_adapterName, __ice_connectionId)
+    IPConnectionInfo(bool __ice_incoming, const ::std::string& __ice_adapterName, const ::std::string& __ice_connectionId, ::Ice::Int __ice_rcvSize, ::Ice::Int __ice_sndSize, const ::std::string& __ice_localAddress, ::Ice::Int __ice_localPort, const ::std::string& __ice_remoteAddress, ::Ice::Int __ice_remotePort) :
+        ::Ice::ConnectionInfo(__ice_incoming, __ice_adapterName, __ice_connectionId, __ice_rcvSize, __ice_sndSize)
         ,
         localAddress(__ice_localAddress),
         localPort(__ice_localPort),
@@ -398,8 +416,8 @@ public:
     {
     }
 
-    TCPConnectionInfo(bool __ice_incoming, const ::std::string& __ice_adapterName, const ::std::string& __ice_connectionId, const ::std::string& __ice_localAddress, ::Ice::Int __ice_localPort, const ::std::string& __ice_remoteAddress, ::Ice::Int __ice_remotePort) :
-        ::Ice::IPConnectionInfo(__ice_incoming, __ice_adapterName, __ice_connectionId, __ice_localAddress, __ice_localPort, __ice_remoteAddress, __ice_remotePort)
+    TCPConnectionInfo(bool __ice_incoming, const ::std::string& __ice_adapterName, const ::std::string& __ice_connectionId, ::Ice::Int __ice_rcvSize, ::Ice::Int __ice_sndSize, const ::std::string& __ice_localAddress, ::Ice::Int __ice_localPort, const ::std::string& __ice_remoteAddress, ::Ice::Int __ice_remotePort) :
+        ::Ice::IPConnectionInfo(__ice_incoming, __ice_adapterName, __ice_connectionId, __ice_rcvSize, __ice_sndSize, __ice_localAddress, __ice_localPort, __ice_remoteAddress, __ice_remotePort)
         
     {
     }
@@ -429,8 +447,8 @@ public:
     {
     }
 
-    UDPConnectionInfo(bool __ice_incoming, const ::std::string& __ice_adapterName, const ::std::string& __ice_connectionId, const ::std::string& __ice_localAddress, ::Ice::Int __ice_localPort, const ::std::string& __ice_remoteAddress, ::Ice::Int __ice_remotePort, const ::std::string& __ice_mcastAddress, ::Ice::Int __ice_mcastPort) :
-        ::Ice::IPConnectionInfo(__ice_incoming, __ice_adapterName, __ice_connectionId, __ice_localAddress, __ice_localPort, __ice_remoteAddress, __ice_remotePort)
+    UDPConnectionInfo(bool __ice_incoming, const ::std::string& __ice_adapterName, const ::std::string& __ice_connectionId, ::Ice::Int __ice_rcvSize, ::Ice::Int __ice_sndSize, const ::std::string& __ice_localAddress, ::Ice::Int __ice_localPort, const ::std::string& __ice_remoteAddress, ::Ice::Int __ice_remotePort, const ::std::string& __ice_mcastAddress, ::Ice::Int __ice_mcastPort) :
+        ::Ice::IPConnectionInfo(__ice_incoming, __ice_adapterName, __ice_connectionId, __ice_rcvSize, __ice_sndSize, __ice_localAddress, __ice_localPort, __ice_remoteAddress, __ice_remotePort)
         ,
         mcastAddress(__ice_mcastAddress),
         mcastPort(__ice_mcastPort)
@@ -459,7 +477,7 @@ inline bool operator<(const UDPConnectionInfo& l, const UDPConnectionInfo& r)
     return static_cast<const ::Ice::LocalObject&>(l) < static_cast<const ::Ice::LocalObject&>(r);
 }
 
-class ICE_API WSConnectionInfo : public ::Ice::IPConnectionInfo
+class ICE_API WSConnectionInfo : public ::Ice::TCPConnectionInfo
 {
 public:
 
@@ -469,13 +487,20 @@ public:
     {
     }
 
-    WSConnectionInfo(bool __ice_incoming, const ::std::string& __ice_adapterName, const ::std::string& __ice_connectionId, const ::std::string& __ice_localAddress, ::Ice::Int __ice_localPort, const ::std::string& __ice_remoteAddress, ::Ice::Int __ice_remotePort) :
-        ::Ice::IPConnectionInfo(__ice_incoming, __ice_adapterName, __ice_connectionId, __ice_localAddress, __ice_localPort, __ice_remoteAddress, __ice_remotePort)
-        
+    WSConnectionInfo(bool __ice_incoming, const ::std::string& __ice_adapterName, const ::std::string& __ice_connectionId, ::Ice::Int __ice_rcvSize, ::Ice::Int __ice_sndSize, const ::std::string& __ice_localAddress, ::Ice::Int __ice_localPort, const ::std::string& __ice_remoteAddress, ::Ice::Int __ice_remotePort, const ::Ice::HeaderDict& __ice_headers) :
+        ::Ice::TCPConnectionInfo(__ice_incoming, __ice_adapterName, __ice_connectionId, __ice_rcvSize, __ice_sndSize, __ice_localAddress, __ice_localPort, __ice_remoteAddress, __ice_remotePort)
+        ,
+        headers(__ice_headers)
     {
     }
 
 
+public:
+
+    ::Ice::HeaderDict headers;
+
+protected:
+
     virtual ~WSConnectionInfo() {}
 };