Attachment #134549 for bug #179233




# $FreeBSD: devel/ice/Makefile 316654 2013-04-27 08:50:46Z mva $

PORTNAME=		Ice
PORTVERSION=		3.5.0
PORTREVISION=		3
CATEGORIES=		devel
MASTER_SITES=		http://download.zeroc.com/Ice/3.5/

MAINTAINER=		freebsd@grem.de
COMMENT=		Modern alternative to object middleware such as CORBA/COM/DCOM/COM+

LICENSE=		GPLv2

LIB_DEPENDS=		expat:${PORTSDIR}/textproc/expat2 \
			mcpp:${PORTSDIR}/devel/mcpp



USE_GMAKE=		yes
USES=			iconv
USE_BDB=		5
INVALID_BDB_VER=	2 3 40 41 42 43 44 46 47 48
USE_LDCONFIG=		yes
BUILD_WRKSRC=		${WRKSRC}/cpp
INSTALL_WRKSRC=		${WRKSRC}/cpp

Lines 1-2 Link Here

(-)./distinfo (-2 / +2 lines)
1	SHA256 (Ice-3.4.2.tar.gz) = dcf0484495b6df0849ec90a00e8204fe5fe1c0d3882bb438bf2c1d062f15c979	1	SHA256 (Ice-3.5.0.tar.gz) = 583d4a819d50ad8b79b1e9ad45abfa3078f981486271ca8cd9ede8fa420ff575
2	SIZE (Ice-3.4.2.tar.gz) = 5485106	2	SIZE (Ice-3.5.0.tar.gz) = 5388847




--- cpp/config/Make.rules.orig	Fri Mar  9 00:16:54 2007
+++ cpp/config/Make.rules	Fri Apr 13 20:05:04 2007
@@ -188,7 +188,9 @@
       DB_FLAGS          = -I/usr/include/db45
       DB_LIBS           = -L/usr/$(libsubdir)/db45 -ldb_cxx
    else
-      DB_LIBS           = -ldb_cxx
+      DB_FLAGS          = -I%%BDB_INCLUDE_DIR%%
+      DB_LIBS           = -L%%BDB_LIB_DIR%% -l%%BDB_LIB_CXX_NAME%%
+      DB_RPATH_LINK     = $(call rpathlink,%%BDB_LIB_DIR%%)
    endif
 endif




--- cpp.orig/Makefile	2012-03-04 21:38:42.000000000 +0100
+++ cpp/Makefile	2012-03-04 21:38:42.000000000 +0100
@@ -11,7 +11,22 @@
 
 include $(top_srcdir)/config/Make.rules
 
-SUBDIRS		= config src include test demo
+SUBDIRS		= config src include
+
+ifeq ($(NOTESTS),)
+SUBDIRS		+= test
+endif
+
+ifeq ($(NODEMOS),)
+SUBDIRS		+= demo
+endif
+
+ifeq ($(NOPORTDOCS),)
+SUBDIRS		+= doc
+endif
+ 
+ INSTALL_SUBDIRS	= $(install_bindir) $(install_libdir) $(install_includedir) $(install_configdir)
+ 
 
 INSTALL_SUBDIRS	= $(install_bindir) $(install_libdir) $(install_includedir) $(install_configdir)
 




--- config.orig/Make.common.rules	2013-05-20 22:21:58.666286011 +0000
+++ config/Make.common.rules	2013-05-20 22:20:50.897196090 +0000
@@ -378,11 +378,15 @@
 	then \
 	    echo "Creating $(install_slicedir)..." ; \
 	    $(call mkdir, $(install_slicedir)) ; \
+	fi
+
+	@if test -d $(install_slicedir) ; \
+	then \
 	    cd $(top_srcdir)/../slice ; \
 	    for subdir in * ; \
 	    do \
 	        echo "Copying slice/$$subdir to $(install_slicedir)..." ; \
 	        cp -fpr $$subdir $(install_slicedir) ; \
 	    done ; \
-	    fi
+	fi




--- cpp.orig/Makefile	2013-03-11 15:19:46.000000000 +0000
+++ cpp/Makefile	2013-05-19 22:06:57.713280491 +0000
@@ -11,11 +11,22 @@
 
 include $(top_srcdir)/config/Make.rules
 
-SUBDIRS		= config src include test
+SUBDIRS		= config src include
+
+ifeq ($(NOTESTS),)
+SUBDIRS		:= $(SUBDIRS) test
+endif
 
 ifeq ($(shell uname | grep MINGW),)
+ifeq ($(NODEMOS),)
 SUBDIRS		:= $(SUBDIRS) demo
 endif
+endif
+
+ifeq ($(NOPORTDOCS),)
+SUBDIRS		:= $(SUBDIRS) doc
+endif
+
 
 INSTALL_SUBDIRS	= $(install_bindir) $(install_libdir) $(install_includedir) $(install_configdir)
 




--- cpp.orig/allTests.py	2013-03-11 15:19:58.000000000 +0000
+++ cpp/allTests.py	2013-05-19 22:25:00.000000000 +0000
@@ -25,6 +25,7 @@
 # List of all basic tests.
 #
 tests = [ 
+
     ("IceUtil/condvar", ["once", "win32only"]),
     ("IceUtil/thread",  ["once"]),
     ("IceUtil/unicode", ["once"]),
@@ -62,7 +63,7 @@
     ("Ice/servantLocator", ["core"]),
     ("Ice/interceptor", ["core"]),

 if TestUtil.isWin32() or os.getuid() == 0:
     tests += [
-        ("IceUtil/priority", ["core", "nodarwin"]),
-        ("Ice/threadPoolPriority", ["core", "nodarwin", "nomx"])
+        ("IceUtil/priority", ["core", "nodarwin", "nofreebsd"]),
+        ("Ice/threadPoolPriority", ["core", "nodarwin", "nofreebsd", "nomx"])
         ]
 
 if __name__ == "__main__":




--- cpp.orig/config/Make.rules	Fri Mar 11 16:19:00 2013
+++ cpp/config/Make.rules	Fri May 19 22:00:09 2013
@@ -233,7 +233,9 @@
           DB_FLAGS          = -I/usr/local/include/db53
           DB_LIBS           = -L/usr/local/$(libsubdir)/db53 -ldb_cxx
       else
-        DB_LIBS      = -ldb_cxx
+        DB_FLAGS          = -I%%BDB_INCLUDE_DIR%%
+        DB_LIBS           = -L%%BDB_LIB_DIR%% -l%%BDB_LIB_CXX_NAME%%
+        DB_RPATH_LINK     = $(call rpathlink,%%BDB_LIB_DIR%%)
       endif
    endif
 endif

Lines 1-10 Link Here

(-)./files/patch-cpp-demo-Freeze-customEvictor-Evictor.h (-10 lines)
1	--- cpp.orig/demo/Freeze/customEvictor/Evictor.h 2011-06-15 21:43:58.000000000 +0200
2	+++ cpp/demo/Freeze/customEvictor/Evictor.h 2012-09-10 11:43:58.000000000 +0200
3	@@ -66,6 +66,7 @@ class Evictor : public Ice::ServantLocator
4	public:
5
6	Evictor(CurrentDatabase&, int);
7	+ virtual ~Evictor() ICE_NOEXCEPT_TRUE {};
8
9	virtual Ice::ObjectPtr locate(const Ice::Current&, Ice::LocalObjectPtr&);
10	virtual void finished(const Ice::Current&, const Ice::ObjectPtr&, const Ice::LocalObjectPtr&);




--- cpp.orig/demo/IceGrid/secure/README	2011-06-15 21:44:00.000000000 +0200
+++ cpp/demo/IceGrid/secure/README	2012-03-04 19:55:44.000000000 +0100
@@ -31,9 +31,10 @@
 the filesystem permissions to restrict access to the certificate.
 
 Once the certificates are generated, you can start the IceGrid
-registry, node, and Glacier2 router:
+registries, node, and Glacier2 router:
 
-$ icegridregistry --Ice.Config=config.registry
+$ icegridregistry --Ice.Config=config.master
+$ icegridregistry --Ice.Config=config.slave
 $ icegridnode --Ice.Config=config.node
 $ glacier2router --Ice.Config=config.glacier2
 




--- cpp.orig/demo/IceGrid/secure/application.xml	2011-06-15 21:43:58.000000000 +0200
+++ cpp/demo/IceGrid/secure/application.xml	2012-03-04 19:55:44.000000000 +0100
@@ -20,8 +20,8 @@
       <property name="IceSSL.DefaultDir" value="certs"/>
 
       <property name="Ice.Admin.Endpoints" value="ssl -h 127.0.0.1"/>
-      <property name="IceSSL.TrustOnly.Client" value="CN=IceGrid Registry"/>
-      <property name="IceSSL.TrustOnly.Server.Ice.Admin" value="CN=IceGrid Node"/>
+      <property name="IceSSL.TrustOnly.Client" value="CN=Master;CN=Slave"/>
+      <property name="IceSSL.TrustOnly.Server.Ice.Admin" value="CN=Node"/>
     </properties>
 
     <node name="Node">

Lines 1-11 Link Here

(-)./files/patch-cpp-demo-IceGrid-secure-config.admin (-11 lines)
1	--- cpp.orig/demo/IceGrid/secure/config.admin 2011-06-15 21:43:58.000000000 +0200
2	+++ cpp/demo/IceGrid/secure/config.admin 2012-03-04 19:55:44.000000000 +0100
3	@@ -14,7 +14,7 @@
4	# SSL Configuration
5	#
6	IceSSL.DefaultDir=certs
7	-IceSSL.TrustOnly.Client=CN="IceGrid Registry";CN="Glacier2"
8	+IceSSL.TrustOnly.Client=CN="Master";CN="Slave";CN="Glacier2"
9
10	# C++ configuration
11	Ice.Plugin.IceSSL.cpp=IceSSL:createIceSSL

Lines 1-11 Link Here

(-)./files/patch-cpp-demo-IceGrid-secure-config.client (-11 lines)
1	--- cpp.orig/demo/IceGrid/secure/config.client 2011-06-15 21:43:58.000000000 +0200
2	+++ cpp/demo/IceGrid/secure/config.client 2012-03-04 19:55:44.000000000 +0100
3	@@ -1,7 +1,7 @@
4	#
5	# The IceGrid locator proxy.
6	#
7	-Ice.Default.Locator=DemoIceGrid/Locator:tcp -p 4061
8	+Ice.Default.Locator=DemoIceGrid/Locator:tcp -p 4061:tcp -p 14061
9
10	#
11	# Trace properties.




--- cpp.orig/demo/IceGrid/secure/config.master	2012-03-04 19:55:44.000000000 +0100
+++ cpp/demo/IceGrid/secure/config.master	2012-03-04 19:55:44.000000000 +0100
@@ -0,0 +1,61 @@
+#
+# The IceGrid instance name.
+#
+IceGrid.InstanceName=DemoIceGrid
+
+#
+# IceGrid registry configuration.
+#
+IceGrid.Registry.Client.Endpoints=tcp -p 4061 -t 10000:ssl -p 4062 -t 10000
+IceGrid.Registry.Server.Endpoints=ssl -t 10000
+IceGrid.Registry.Internal.Endpoints=ssl -t 10000
+IceGrid.Registry.Data=db/master
+
+#
+# Ensure that nodes and slaves connecting to this registry have a name
+# matching the certificate CN.
+#
+IceGrid.Registry.RequireNodeCertCN=1
+IceGrid.Registry.RequireReplicaCertCN=1
+
+#
+# IceGrid admin clients must use a secure connection to connect to the
+# registry or use Glacier2.
+#
+IceGrid.Registry.AdminSessionManager.Endpoints=ssl -t 10000
+IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
+
+#
+# IceGrid SQL configuration if using SQL database.
+#
+#Ice.Plugin.DB=IceGridSqlDB:createSqlDB
+#IceGrid.SQL.DatabaseType=QSQLITE
+#IceGrid.SQL.DatabaseName=db/master/Registry.db
+
+#
+# Trace properties.
+#
+Ice.ProgramName=Master
+IceGrid.Registry.Trace.Node=2
+IceGrid.Registry.Trace.Replica=2
+
+#
+# SSL Configuration
+#
+Ice.Plugin.IceSSL=IceSSL:createIceSSL
+IceSSL.DefaultDir=certs
+IceSSL.CertAuthFile=ca_cert.pem
+IceSSL.CertFile=master_cert.pem
+IceSSL.KeyFile=master_key.pem
+
+#
+# Don't require certificates. This is useful for admin clients that don't
+# use certificate but still need to establish a secure connection for the
+# username/password authentication
+#
+IceSSL.VerifyPeer=1
+
+IceSSL.TrustOnly.Client=CN="Master";CN="Slave";CN="Node";CN="Glacier2"
+IceSSL.TrustOnly.Server.IceGrid.Registry.Server=CN="Server"
+IceSSL.TrustOnly.Server.IceGrid.Registry.Internal=CN="Node";CN="Master";CN="Slave"
+IceSSL.TrustOnly.Server.IceGrid.Registry.AdminSessionManager=CN="Glacier2"




--- cpp.orig/demo/IceGrid/secure/config.node	2011-06-15 21:43:58.000000000 +0200
+++ cpp/demo/IceGrid/secure/config.node	2012-03-04 19:55:44.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # The IceGrid locator proxy.
 #
-Ice.Default.Locator=DemoIceGrid/Locator:ssl -p 4062 -t 10000
+Ice.Default.Locator=DemoIceGrid/Locator:ssl -p 4062 -t 10000:ssl -p 14062 -t 10000
 
 #
 # IceGrid node configuration.
@@ -26,5 +26,5 @@
 IceSSL.CertFile=node_cert.pem
 IceSSL.KeyFile=node_key.pem
 
-IceSSL.TrustOnly.Client=CN="Server";CN="IceGrid Registry"
-IceSSL.TrustOnly.Server=CN="IceGrid Registry"
+IceSSL.TrustOnly.Client=CN="Server";CN="Master";CN="Slave"
+IceSSL.TrustOnly.Server=CN="Master";CN="Slave"




--- cpp.orig/demo/IceGrid/secure/config.registry	2011-06-15 21:43:58.000000000 +0200
+++ cpp/demo/IceGrid/secure/config.registry	2012-03-04 19:55:44.000000000 +0100
@@ -1,54 +0,0 @@
-#
-# The IceGrid instance name.
-#
-IceGrid.InstanceName=DemoIceGrid
-
-#
-# IceGrid registry configuration.
-#
-IceGrid.Registry.Client.Endpoints=tcp -p 4061 -t 10000:ssl -p 4062 -t 10000
-IceGrid.Registry.Server.Endpoints=ssl -t 10000
-IceGrid.Registry.Internal.Endpoints=ssl -t 10000
-IceGrid.Registry.Data=db/registry
-
-#
-# IceGrid admin clients must use a secure connection to connect to the
-# registry or use Glacier2.
-#
-IceGrid.Registry.AdminSessionManager.Endpoints=ssl -t 10000
-IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
-
-#
-# IceGrid SQL configuration if using SQL database.
-#
-#Ice.Plugin.DB=IceGridSqlDB:createSqlDB
-#IceGrid.SQL.DatabaseType=QSQLITE
-#IceGrid.SQL.DatabaseName=db/registry/Registry.db
-
-#
-# Trace properties.
-#
-Ice.ProgramName=Registry
-IceGrid.Registry.Trace.Node=2
-IceGrid.Registry.Trace.Replica=2
-
-#
-# SSL Configuration
-#
-Ice.Plugin.IceSSL=IceSSL:createIceSSL
-IceSSL.DefaultDir=certs
-IceSSL.CertAuthFile=ca_cert.pem
-IceSSL.CertFile=registry_cert.pem
-IceSSL.KeyFile=registry_key.pem
-
-#
-# Don't require certificates. This is useful for admin clients that don't
-# use certificate but still need to establish a secure connection for the
-# username/password authentication
-#
-IceSSL.VerifyPeer=1
-
-IceSSL.TrustOnly.Client=CN="IceGrid Registry";CN="IceGrid Node";CN="Glacier2"
-IceSSL.TrustOnly.Server.IceGrid.Registry.Server=CN="Server"
-IceSSL.TrustOnly.Server.IceGrid.Registry.Internal=CN="IceGrid Node";CN="IceGrid Registry"
-IceSSL.TrustOnly.Server.IceGrid.Registry.AdminSessionManager=CN="Glacier2"




--- cpp.orig/demo/IceGrid/secure/config.slave	2012-03-04 19:55:44.000000000 +0100
+++ cpp/demo/IceGrid/secure/config.slave	2012-03-04 19:55:44.000000000 +0100
@@ -0,0 +1,66 @@
+#
+# The IceGrid locator proxy.
+#
+Ice.Default.Locator=DemoIceGrid/Locator:ssl -p 4062 -t 10000
+
+#
+# The IceGrid instance name.
+#
+IceGrid.InstanceName=DemoIceGrid
+
+#
+# IceGrid registry configuration.
+#
+IceGrid.Registry.Client.Endpoints=tcp -p 14061 -t 10000:ssl -p 14062 -t 10000
+IceGrid.Registry.Server.Endpoints=ssl -t 10000
+IceGrid.Registry.Internal.Endpoints=ssl -t 10000
+IceGrid.Registry.Data=db/slave
+IceGrid.Registry.ReplicaName=Slave
+
+#
+# Ensure that nodes connecting to this registry have a name matching
+# the certificate CN.
+#
+IceGrid.Registry.RequireNodeCertCN=1
+
+#
+# IceGrid admin clients must use a secure connection to connect to the
+# registry or use Glacier2.
+#
+IceGrid.Registry.AdminSessionManager.Endpoints=ssl -t 10000
+IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
+
+#
+# IceGrid SQL configuration if using SQL database.
+#
+#Ice.Plugin.DB=IceGridSqlDB:createSqlDB
+#IceGrid.SQL.DatabaseType=QSQLITE
+#IceGrid.SQL.DatabaseName=db/slave/Registry.db
+
+#
+# Trace properties.
+#
+Ice.ProgramName=Slave
+IceGrid.Registry.Trace.Node=2
+IceGrid.Registry.Trace.Replica=2
+
+#
+# SSL Configuration
+#
+Ice.Plugin.IceSSL=IceSSL:createIceSSL
+IceSSL.DefaultDir=certs
+IceSSL.CertAuthFile=ca_cert.pem
+IceSSL.CertFile=slave_cert.pem
+IceSSL.KeyFile=slave_key.pem
+
+#
+# Don't require certificates. This is useful for admin clients that don't
+# use certificate but still need to establish a secure connection for the
+# username/password authentication
+#
+IceSSL.VerifyPeer=1
+
+IceSSL.TrustOnly.Client=CN="Master";CN="Slave";CN="Node";CN="Glacier2"
+IceSSL.TrustOnly.Server.IceGrid.Registry.Server=CN="Server"
+IceSSL.TrustOnly.Server.IceGrid.Registry.Internal=CN="Node";CN="Master";CN="Slave"
+IceSSL.TrustOnly.Server.IceGrid.Registry.AdminSessionManager=CN="Glacier2"




--- cpp.orig/demo/IceGrid/secure/makecerts.py	2011-06-15 21:43:58.000000000 +0200
+++ cpp/demo/IceGrid/secure/makecerts.py	2012-03-04 19:55:44.000000000 +0100
@@ -44,8 +44,9 @@
 print
 print
 
-createCertificate("registry", "IceGrid Registry")
-createCertificate("node", "IceGrid Node")
+createCertificate("master", "Master")
+createCertificate("slave", "Slave")
+createCertificate("node", "Node")
 createCertificate("glacier2", "Glacier2")
 createCertificate("server", "Server")
 

Lines 1-11 Link Here

(-)./files/patch-cpp-include-Freeze-Map.h (-11 lines)
1	--- cpp.orig/include/Freeze/Map.h 2011-06-15 21:43:58.000000000 +0200
2	+++ cpp/include/Freeze/Map.h 2012-03-04 20:14:52.000000000 +0100
3	@@ -426,7 +426,7 @@
4
5	ConstIterator(MapHelper& mapHelper, const Ice::CommunicatorPtr& communicator) :
6	_helper(IteratorHelper::create(mapHelper, true)),
7	- _communicator(_communicator),
8	+ _communicator(communicator),
9	_refValid(false)
10	{
11	}

Lines 1-10 Link Here

(-)./files/patch-cpp-include-Ice-Buffer.h (-10 lines)
1	--- cpp.orig/include/Ice/Buffer.h 2011-06-15 21:43:58.000000000 +0200
2	+++ cpp/include/Ice/Buffer.h 2012-03-04 20:14:52.000000000 +0100
3	@@ -10,6 +10,7 @@
4	#ifndef ICEE_BUFFER_H
5	#define ICEE_BUFFER_H
6
7	+#include <cstddef>
8	#include <Ice/Config.h>
9
10	namespace IceInternal




--- cpp.orig/include/Ice/ConnectionIF.h	2011-06-15 21:43:58.000000000 +0200
+++ cpp/include/Ice/ConnectionIF.h	2012-03-04 20:14:52.000000000 +0100
@@ -17,13 +17,13 @@
 {
 
 class ConnectionI;
+ICE_API Ice::LocalObject* upCast(Ice::ConnectionI*);
 
 }
 
 namespace IceInternal
 {
 
-ICE_API Ice::LocalObject* upCast(Ice::ConnectionI*);
 
 enum AsyncStatus
 {




--- cpp.orig/include/Ice/IconvStringConverter.h	2011-06-15 21:43:58.000000000 +0200
+++ cpp/include/Ice/IconvStringConverter.h	2012-03-04 20:14:52.000000000 +0100
@@ -225,10 +225,16 @@
 template<typename charT> /*static*/ void
 IconvStringConverter<charT>::close(std::pair<iconv_t, iconv_t> cdp)
 {
-    int rs = iconv_close(cdp.first);
+#ifndef NDEBUG
+    int rs = 
+#endif
+    iconv_close(cdp.first);
     assert(rs == 0);
 
-    rs = iconv_close(cdp.second);
+#ifndef NDEBUG
+    rs = 
+#endif
+    iconv_close(cdp.second);
     assert(rs == 0);
 }
  




--- cpp.orig/include/Ice/IncomingAsyncF.h	2011-06-15 21:43:58.000000000 +0200
+++ cpp/include/Ice/IncomingAsyncF.h	2012-03-04 20:14:52.000000000 +0100
@@ -28,12 +28,6 @@
 
 class AMD_Object_ice_invoke;
 class AMD_Array_Object_ice_invoke;
-
-}
-
-namespace IceInternal
-{
-
 ICE_API IceUtil::Shared* upCast(::Ice::AMD_Object_ice_invoke*);
 ICE_API IceUtil::Shared* upCast(::Ice::AMD_Array_Object_ice_invoke*);
 




--- cpp.orig/include/Ice/LocalObjectF.h	2011-06-15 21:43:58.000000000 +0200
+++ cpp/include/Ice/LocalObjectF.h	2012-03-04 20:14:52.000000000 +0100
@@ -18,12 +18,6 @@
 {
 
 class LocalObject;
-
-}
-
-namespace IceInternal
-{
-
 ICE_API IceUtil::Shared* upCast(::Ice::LocalObject*);
 
 }




--- cpp.orig/include/Ice/ObjectF.h	2011-06-15 21:43:58.000000000 +0200
+++ cpp/include/Ice/ObjectF.h	2012-03-04 20:14:52.000000000 +0100
@@ -17,19 +17,8 @@
 {
 
 class Object;
-
-}
-
-namespace IceInternal
-{
-
 ICE_API IceUtil::Shared* upCast(::Ice::Object*);
 
-}
-
-namespace Ice
-{
-
 typedef IceInternal::Handle< Object > ObjectPtr;
 
 void ICE_API __patch__ObjectPtr(void*, ObjectPtr&);




--- cpp.orig/include/Ice/OutgoingAsyncF.h	2011-06-15 21:43:58.000000000 +0200
+++ cpp/include/Ice/OutgoingAsyncF.h	2012-03-04 20:14:52.000000000 +0100
@@ -19,13 +19,13 @@
 
 class AsyncResult;
 typedef IceInternal::Handle<AsyncResult> AsyncResultPtr;
+ICE_API IceUtil::Shared* upCast(::Ice::AsyncResult*);
 
 }
 
 namespace IceInternal
 {
 
-ICE_API IceUtil::Shared* upCast(::Ice::AsyncResult*);
 
 class OutgoingAsync;
 ICE_API IceUtil::Shared* upCast(OutgoingAsync*);




--- cpp.orig/include/Ice/Proxy.h	2011-06-15 21:43:58.000000000 +0200
+++ cpp/include/Ice/Proxy.h	2012-03-04 20:14:52.000000000 +0100
@@ -38,6 +38,8 @@
 
 class Locator;
 class Router;
+ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::Locator*);
+ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::Router*);
 
 }
 
@@ -46,8 +48,6 @@
 namespace IceInternal
 {
 
-ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::Locator*);
-ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::Router*);
 
 class LocalExceptionWrapper;
 
@@ -1172,7 +1172,7 @@
 
     TwowayCallbackNC(const TPtr& instance, bool cb, Exception excb, Sent sentcb) : CallbackNC<T>(instance, excb, sentcb)
     {
-        checkCallback(instance, cb || excb != 0);
+        this->checkCallback(instance, cb || excb != 0);
     }
 };
 
@@ -1188,7 +1188,7 @@
 
     TwowayCallback(const TPtr& instance, bool cb, Exception excb, Sent sentcb) : Callback<T, CT>(instance, excb, sentcb)
     {
-        checkCallback(instance, cb || excb != 0);
+        this->checkCallback(instance, cb || excb != 0);
     }
 };
 
@@ -1209,7 +1209,7 @@
     OnewayCallbackNC(const TPtr& instance, Response cb, Exception excb, Sent sentcb) : 
         CallbackNC<T>(instance, excb, sentcb), response(cb)
     {
-        checkCallback(instance, cb != 0 || excb != 0);
+        this->checkCallback(instance, cb != 0 || excb != 0);
     }
 
     virtual void __completed(const ::Ice::AsyncResultPtr& result) const
@@ -1254,7 +1254,7 @@
     OnewayCallback(const TPtr& instance, Response cb, Exception excb, Sent sentcb) : 
         Callback<T, CT>(instance, excb, sentcb),  response(cb)
     {
-        checkCallback(instance, cb != 0 || excb != 0);
+        this->checkCallback(instance, cb != 0 || excb != 0);
     }
 
     virtual void __completed(const ::Ice::AsyncResultPtr& result) const




--- cpp.orig/include/Ice/ProxyF.h	2011-06-15 21:43:58.000000000 +0200
+++ cpp/include/Ice/ProxyF.h	2012-03-04 20:14:52.000000000 +0100
@@ -22,6 +22,11 @@
 {
 
 class Object;
+inline ::IceProxy::Ice::Object* 
+upCast(::IceProxy::Ice::Object* o)
+{
+    return o;
+}
 
 }
 
@@ -34,6 +39,11 @@
 {
 
 class Object;
+inline ::IceDelegate::Ice::Object*
+upCast(::IceDelegate::Ice::Object* o)
+{
+    return o;
+}
 
 }
 
@@ -47,6 +57,12 @@
 
 class Object;
 
+inline ::IceDelegateM::Ice::Object*
+upCast(::IceDelegateM::Ice::Object* o)
+{
+    return o;
+}
+
 }
 
 }
@@ -58,36 +74,12 @@
 {
 
 class Object;
-
-}
-
-}
-
-namespace IceInternal
-{
-
-inline ::IceProxy::Ice::Object* 
-upCast(::IceProxy::Ice::Object* o)
-{
-    return o;
-}
-
-inline ::IceDelegate::Ice::Object*
-upCast(::IceDelegate::Ice::Object* o)
-{
-    return o;
-}
-
 inline ::IceDelegateD::Ice::Object*
 upCast(::IceDelegateD::Ice::Object* o)
 {
     return o;
 }
 
-inline ::IceDelegateM::Ice::Object*
-upCast(::IceDelegateM::Ice::Object* o)
-{
-    return o;
 }
 
 }




--- cpp.orig/include/Ice/Stream.h	2011-06-15 21:43:58.000000000 +0200
+++ cpp/include/Ice/Stream.h	2012-03-04 20:14:52.000000000 +0100
@@ -17,6 +17,12 @@
 #include <Ice/Proxy.h>
 #include <IceUtil/Shared.h>
 
+namespace IceInternal
+{
+    // Forward declaration required for writer specializations.
+    void delegateThrowMarshalException(const char*, int, const ::std::string&);
+}
+
 namespace Ice
 {
     
@@ -45,9 +51,6 @@
     StreamTraitTypeUnknown
 };
 
-// Forward declaration required for writer specializations.
-class MarshalException;
-
 //
 // Base trait template. This doesn't actually do anything -- we just
 // use it as a template that we can specialize.
@@ -542,7 +545,7 @@
     {
         if(static_cast<int>(v) < 0 || static_cast<int>(v) >= StreamTrait<T>::enumLimit)
         {
-            throw MarshalException(__FILE__, __LINE__, "enumerator out of range");
+            IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range");
         }
         outS->write(static_cast<Byte>(v));
     }
@@ -558,7 +561,7 @@
         inS->read(val);
         if(val > StreamTrait<T>::enumLimit)
         {
-            throw MarshalException(__FILE__, __LINE__, "enumerator out of range");
+            IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range");
         }
         v = static_cast<T>(val);
     }
@@ -573,7 +576,7 @@
     {
         if(static_cast<int>(v) < 0 || static_cast<int>(v) >= StreamTrait<T>::enumLimit)
         {
-            throw MarshalException(__FILE__, __LINE__, "enumerator out of range");
+            IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range");
         }
         outS->write(static_cast<Short>(v));
     }
@@ -589,7 +592,7 @@
         inS->read(val);
         if(val < 0 || val > StreamTrait<T>::enumLimit)
         {
-            throw MarshalException(__FILE__, __LINE__, "enumerator out of range");
+            IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range");
         }
         v = static_cast<T>(val);
     }
@@ -603,7 +606,7 @@
     {
         if(static_cast<int>(v) < 0 || static_cast<int>(v) >= StreamTrait<T>::enumLimit)
         {
-            throw MarshalException(__FILE__, __LINE__, "enumerator out of range");
+            IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range");
         }
         outS->write(static_cast<Int>(v));
     }
@@ -619,7 +622,7 @@
         inS->read(val);
         if(val < 0 || val > StreamTrait<T>::enumLimit)
         {
-            throw MarshalException(__FILE__, __LINE__, "enumerator out of range");
+            IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range");
         }
         v = static_cast<T>(val);
     }
--- cpp.orig/include/Ice/Stream.h	2011-06-15 21:43:58.000000000 +0200
+++ cpp/include/Ice/Stream.h	2012-09-10 11:43:58.000000000 +0200
@@ -664,7 +664,7 @@ struct StreamWriter<StreamTraitTypeSequenceBool>
         outS->writeSize(static_cast<Int>(v.size()));
         for(typename T::const_iterator p = v.begin(); p != v.end(); ++p)
         {
-            outS->write(*p);
+            outS->write(static_cast<bool>(*p));
         }
     }
 };




--- cpp.orig/include/Ice/StreamF.h	2011-06-15 21:43:58.000000000 +0200
+++ cpp/include/Ice/StreamF.h	2012-03-04 20:14:52.000000000 +0100
@@ -19,12 +19,6 @@
 
 class InputStream;
 class OutputStream;
-
-}
-
-namespace IceInternal
-{
-
 ICE_API IceUtil::Shared* upCast(::Ice::InputStream*);
 ICE_API IceUtil::Shared* upCast(::Ice::OutputStream*);
 

Lines 1-10 Link Here

(-)./files/patch-cpp-include-IceUtil-Cache.h (-10 lines)
1	--- cpp.orig/include/IceUtil/Cache.h 2011-06-15 21:43:58.000000000 +0200
2	+++ cpp/include/IceUtil/Cache.h 2012-09-10 11:43:58.000000000 +0200
3	@@ -77,6 +77,6 @@ protected:
4	{
5	}
6
7	- virtual ~Cache()
8	+ virtual ~Cache() ICE_NOEXCEPT_FALSE
9	{
10	}




--- cpp.orig/include/IceUtil/Config.h	2013-03-11 15:19:46.000000000 +0000
+++ cpp/include/IceUtil/Config.h	2013-05-20 02:09:58.239194578 +0000
@@ -51,7 +51,7 @@
 // Check for C++ 11 support
 //
 #if (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || \
-    (defined(__clang__) && (__clang_major__ >= 4) && __cplusplus >= 201103) || \
+    (defined(__clang__) && ((defined(__APPLE__) && __clang_major__ >= 4) || (!defined(__APPLE__) && __clang_major__ >= 3)) && __cplusplus >= 201103) || \
     (defined(_MSC_VER) && (_MSC_VER >= 1600))
 #   define ICE_CPP11
 #endif
+
+
+//
+// Macro used for declaring destructors that might throw - required for C++11
+//
+#if __cplusplus >= 201103L
+#define ICE_DESTRUCTORS_DONT_THROW_BY_DEFAULT
+#define ICE_NOEXCEPT_FALSE noexcept(false)
+#define ICE_NOEXCEPT_TRUE noexcept(true)
+#else
+#define ICE_NOEXCEPT_FALSE
+#define ICE_NOEXCEPT_TRUE
+#endif




--- cpp.orig/include/IceUtil/Mutex.h	2011-06-15 21:43:58.000000000 +0200
+++ cpp/include/IceUtil/Mutex.h	2012-03-04 20:14:52.000000000 +0100
@@ -251,8 +251,11 @@
 inline
 Mutex::~Mutex()
 {
+#ifndef NDEBUG
     int rc = 0;
-    rc = pthread_mutex_destroy(&_mutex);
+    rc = 
+#endif    
+    pthread_mutex_destroy(&_mutex);
     assert(rc == 0);
 }
 




--- cpp.orig/include/IceUtil/Shared.h	2011-06-15 21:43:58.000000000 +0200
+++ cpp/include/IceUtil/Shared.h	2012-09-10 11:43:58.000000000 +0200
@@ -50,6 +50,11 @@
 //
 // A non thread-safe base class for reference-counted types.
 //
+// IceUtil::SimpleSharedUnsafeDestructor
+// =====================
+//
+// A non thread-safe base class for reference-counted types - destructor might throw.
+//
 // IceUtil::Shared
 // ===============
 //
@@ -109,6 +114,57 @@ private:
     bool _noDelete;
 };
 
+class ICE_UTIL_API SimpleSharedUnsafeDestructor
+{
+public:
+
+    SimpleSharedUnsafeDestructor();
+    SimpleSharedUnsafeDestructor(const SimpleSharedUnsafeDestructor&);
+
+    virtual ~SimpleSharedUnsafeDestructor() ICE_NOEXCEPT_FALSE
+    {
+    }
+
+    SimpleSharedUnsafeDestructor& operator=(const SimpleSharedUnsafeDestructor&)
+    {
+        return *this;
+    }
+
+    void __incRef()
+    {
+        assert(_ref >= 0);
+        ++_ref;
+    }
+
+    void __decRef()
+    {
+        assert(_ref > 0);
+        if(--_ref == 0)
+        {
+            if(!_noDelete)
+            {
+                _noDelete = true;
+                delete this;
+            }
+        }
+    }
+
+    int __getRef() const
+    {
+        return _ref;
+    }
+
+    void __setNoDelete(bool b)
+    {
+        _noDelete = b;
+    }
+
+private:
+
+    int _ref;
+    bool _noDelete;
+};
+
 class ICE_UTIL_API Shared
 {
 public:




--- cpp.orig/src/Freeze/MapDb.cpp	2011-06-15 21:43:58.000000000 +0200
+++ cpp/src/Freeze/MapDb.cpp	2012-09-10 11:43:58.000000000 +0200
@@ -72,7 +72,13 @@ Freeze::MapDb::~MapDb()
         }
         catch(const ::DbException& dx)
         {
+#if defined(ICE_DESTRUCTORS_DONT_THROW_BY_DEFAULT)
+            Error out(_communicator->getLogger());
+            out << "DbException while closing database " << _dbName << ": "
+                << dx.what();
+#else
             throw DatabaseException(__FILE__, __LINE__, dx.what());
+#endif
         }
     }
 }
@@ -229,7 +229,11 @@
 #ifndef NDEBUG
                 bool inserted = 
 #endif
-                    _indices.insert(IndexMap::value_type(indexBase->name(), indexI.get())).second;
+                    _indices.insert(IndexMap::value_type(indexBase->name(), indexI.get()))
+#ifndef NDEBUG                    
+                    .second
+#endif
+                ;
                 assert(inserted);
                 
                 indexBase->_impl = indexI.release();




--- cpp.orig/src/Freeze/MapI.cpp	2011-06-15 21:43:58.000000000 +0200
+++ cpp/src/Freeze/MapI.cpp	2012-03-04 20:14:52.000000000 +0100
@@ -749,8 +749,11 @@
 
     try
     {
+#ifndef NDEBUG
         int err;
-        err = _dbc->put(&dbKey, &dbValue, DB_CURRENT);
+        err = 
+#endif
+        _dbc->put(&dbKey, &dbValue, DB_CURRENT);
         assert(err == 0);
     }
     catch(const ::DbDeadlockException& dx)
@@ -1023,7 +1026,11 @@
 #ifndef NDEBUG
         bool inserted =
 #endif 
-            _indices.insert(IndexMap::value_type(indexBase->name(), indexBase)).second;
+            _indices.insert(IndexMap::value_type(indexBase->name(), indexBase))
+#ifndef NDEBUG
+            .second
+#endif
+            ;
         assert(inserted);
         indexBase->_map = this;
     }
@@ -1360,8 +1367,11 @@
         try
         {
             u_int32_t count;
+#ifndef NDEBUG
             int err;
-            err = _db->truncate(txn, &count, txn != 0 ? 0 : DB_AUTO_COMMIT);
+            err = 
+#endif            
+            _db->truncate(txn, &count, txn != 0 ? 0 : DB_AUTO_COMMIT);
             assert(err == 0);
             break;
         }




--- cpp.orig/src/Freeze/MapI.h	2011-06-15 21:43:58.000000000 +0200
+++ cpp/src/Freeze/MapI.h	2012-09-10 11:43:58.000000000 +0200
@@ -63,12 +63,13 @@ public:
     void
     close();
 
-    class Tx : public IceUtil::SimpleShared
+    class Tx : public IceUtil::SimpleSharedUnsafeDestructor
     {
     public:
 
         Tx(const MapHelperI&);
-        ~Tx();
+        ~Tx() ICE_NOEXCEPT_FALSE;
+        ;
 
         void dead();
 

Lines 1-11 Link Here

(-)./files/patch-cpp-src-Freeze-ObjectStore.cpp (-11 lines)
1	--- cpp.orig/src/Freeze/ObjectStore.cpp 2011-06-15 21:43:58.000000000 +0200
2	+++ cpp/src/Freeze/ObjectStore.cpp 2012-09-10 11:43:58.000000000 +0200
3	@@ -189,7 +189,7 @@ Freeze::ObjectStoreBase::ObjectStoreBase(const string& facet, const string& face
4	}
5	}
6
7	-Freeze::ObjectStoreBase::~ObjectStoreBase()
8	+Freeze::ObjectStoreBase::~ObjectStoreBase() ICE_NOEXCEPT_FALSE
9	{
10	try
11	{

Lines 1-11 Link Here

(-)./files/patch-cpp-src-Freeze-ObjectStore.h (-11 lines)
1	--- cpp.orig/src/Freeze/ObjectStore.h 2011-06-15 21:43:58.000000000 +0200
2	+++ cpp/src/Freeze/ObjectStore.h 2012-09-10 11:43:58.000000000 +0200
3	@@ -36,7 +36,7 @@ public:
4	ObjectStoreBase(const std::string&, const std::string&, bool, EvictorIBase*,
5	const std::vector<IndexPtr>&, bool);
6
7	- virtual ~ObjectStoreBase();
8	+ virtual ~ObjectStoreBase() ICE_NOEXCEPT_FALSE;
9
10	const Ice::ObjectPtr& sampleServant() const;
11




--- cpp.orig/src/Freeze/SharedDbEnv.cpp	2011-06-15 21:43:58.000000000 +0200
+++ cpp/src/Freeze/SharedDbEnv.cpp	2012-03-04 20:14:52.000000000 +0100
@@ -336,8 +336,11 @@
         // Remove from map
         //
      
+#ifndef NDEBUG
         size_t one;
-        one = sharedDbEnvMap->erase(key);
+        one = 
+#endif
+        sharedDbEnvMap->erase(key);
         assert(one == 1);
 
         if(sharedDbEnvMap->size() == 0)

Lines 1-11 Link Here

(-)./files/patch-cpp-src-Freeze-TransactionalEvictorContext.cpp (-11 lines)
1	--- cpp.orig/src/Freeze/TransactionalEvictorContext.cpp 2011-06-15 21:43:58.000000000 +0200
2	+++ cpp/src/Freeze/TransactionalEvictorContext.cpp 2012-09-10 11:43:58.000000000 +0200
3	@@ -273,7 +273,7 @@ Freeze::TransactionalEvictorContext::ServantHolder::ServantHolder() :
4	}
5
6
7	-Freeze::TransactionalEvictorContext::ServantHolder::~ServantHolder()
8	+Freeze::TransactionalEvictorContext::ServantHolder::~ServantHolder() ICE_NOEXCEPT_FALSE
9	{
10	if(_ownBody && _body.ownServant)
11	{

Lines 1-11 Link Here

(-)./files/patch-cpp-src-Freeze-TransactionalEvictorContext.h (-11 lines)
1	--- cpp.orig/src/Freeze/TransactionalEvictorContext.h 2011-06-15 21:43:58.000000000 +0200
2	+++ cpp/src/Freeze/TransactionalEvictorContext.h 2012-09-10 11:43:58.000000000 +0200
3	@@ -34,7 +34,7 @@ public:
4	public:
5
6	ServantHolder();
7	- ~ServantHolder();
8	+ ~ServantHolder() ICE_NOEXCEPT_FALSE;
9
10	void init(const TransactionalEvictorContextPtr&, const Ice::Current&, ObjectStore<TransactionalEvictorElement>*);
11

Lines 1-11 Link Here

(-)./files/patch-cpp-src-Freeze-TransactionalEvictorI.cpp (-11 lines)
1	--- cpp.orig/src/Freeze/TransactionalEvictorI.cpp 2011-06-15 21:43:58.000000000 +0200
2	+++ cpp/src/Freeze/TransactionalEvictorI.cpp 2012-09-10 11:43:58.000000000 +0200
3	@@ -346,7 +346,7 @@ Freeze::TransactionalEvictorI::dispatch(Request& request)
4	{
5	}
6
7	- ~CtxHolder()
8	+ ~CtxHolder() ICE_NOEXCEPT_FALSE
9	{
10	if(_ownCtx)
11	{




--- cpp.orig/src/Glacier2/Blobject.cpp	2011-06-15 21:43:58.000000000 +0200
+++ cpp/src/Glacier2/Blobject.cpp	2012-03-04 19:39:27.000000000 +0100
@@ -171,6 +171,15 @@
 }
 
 void
+Glacier2::Blobject::destroy()
+{
+    if(_requestQueue)
+    {
+        _requestQueue->destroy();
+    }
+}
+
+void
 Glacier2::Blobject::invoke(ObjectPrx& proxy, const AMD_Object_ice_invokePtr& amdCB, 
                            const std::pair<const Ice::Byte*, const Ice::Byte*>& inParams, const Current& current)
 {

Lines 1-11 Link Here

(-)./files/patch-cpp-src-Glacier2-Blobject.h (-11 lines)
1	--- cpp.orig/src/Glacier2/Blobject.h 2011-06-15 21:43:58.000000000 +0200
2	+++ cpp/src/Glacier2/Blobject.h 2012-03-04 19:39:27.000000000 +0100
3	@@ -24,6 +24,8 @@
4	Blobject(const InstancePtr&, const Ice::ConnectionPtr&, const Ice::Context&);
5	virtual ~Blobject();
6
7	+ void destroy();
8	+
9	protected:
10
11	void invoke(Ice::ObjectPrx&, const Ice::AMD_Object_ice_invokePtr&,




--- cpp.orig/src/Glacier2/RequestQueue.cpp	2011-06-15 21:43:58.000000000 +0200
+++ cpp/src/Glacier2/RequestQueue.cpp	2012-03-04 19:39:27.000000000 +0100
@@ -185,7 +185,8 @@
     _callback(newCallback_Object_ice_invoke(this, &RequestQueue::response, &RequestQueue::exception,
                                             &RequestQueue::sent)),
     _flushCallback(newCallback_Connection_flushBatchRequests(this, &RequestQueue::exception, &RequestQueue::sent)),
-    _pendingSend(false)
+    _pendingSend(false),
+    _destroyed(false)
 {
 }
 
@@ -241,6 +242,37 @@
 }
 
 void
+Glacier2::RequestQueue::destroy()
+{
+    IceUtil::Mutex::Lock lock(*this);
+
+    _destroyed = true;
+
+    //
+    // Although the session has been destroyed, we cannot destroy this queue
+    // until all requests have completed.
+    //
+    if(_requests.empty())
+    {
+        destroyInternal();
+    }
+}
+
+void
+Glacier2::RequestQueue::destroyInternal()
+{
+    //
+    // Must be called with the mutex locked.
+    //
+
+    //
+    // Remove cyclic references.
+    //
+    const_cast<Ice::Callback_Object_ice_invokePtr&>(_callback) = 0;
+    const_cast<Ice::Callback_Connection_flushBatchRequestsPtr&>(_flushCallback) = 0;
+}
+
+void
 Glacier2::RequestQueue::flush()
 {
     assert(_connection);
@@ -289,6 +321,11 @@
             _pendingSendRequest = 0;
         }
     }
+
+    if(_destroyed && _requests.empty())
+    {
+        destroyInternal();
+    }
 }
 
 void
@@ -312,6 +349,11 @@
         }
     }
     _requests.clear();
+
+    if(_destroyed)
+    {
+        destroyInternal();
+    }
 }
 
 void




--- cpp.orig/src/Glacier2/RequestQueue.h	2011-06-15 21:43:58.000000000 +0200
+++ cpp/src/Glacier2/RequestQueue.h	2012-03-04 19:39:27.000000000 +0100
@@ -65,8 +65,12 @@
     bool addRequest(const RequestPtr&);
     void flushRequests(std::set<Ice::ObjectPrx>&);
 
+    void destroy();
+
 private:
 
+    void destroyInternal();
+
     void flush();
     void flush(std::set<Ice::ObjectPrx>&);
 
@@ -83,6 +87,7 @@
     std::deque<RequestPtr> _requests;
     bool _pendingSend;
     RequestPtr _pendingSendRequest;
+    bool _destroyed;
 };
 typedef IceUtil::Handle<RequestQueue> RequestQueuePtr;
 




--- cpp.orig/src/Glacier2/RouterI.cpp	2011-06-15 21:43:58.000000000 +0200
+++ cpp/src/Glacier2/RouterI.cpp	2012-03-04 19:39:27.000000000 +0100
@@ -98,6 +98,12 @@
             _session->destroy_async(amiCB);
         }
     }
+
+    _clientBlobject->destroy();
+    if(_serverBlobject)
+    {
+        _serverBlobject->destroy();
+    }
 }
 
 ObjectPrx

Line 0 Link Here

(-)./files/patch-cpp-src-Ice-.depend (+8 lines)
		1	--- cpp.orig/src/Ice/.depend 2013-05-21 00:29:56.146194325 +0000
		2	+++ cpp/src/Ice/.depend 2013-05-21 00:42:56.956197313 +0000
		3	@@ -1,5 +1,5 @@
		4	-Acceptor$(OBJEXT): Acceptor.cpp ../Ice/Acceptor.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h ../Ice/AcceptorF.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h ../Ice/TransceiverF.h ../Ice/Network.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/Exception.h $(includedir)/Ice/Format.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/LocalObjectF.h $(includedir)/Ice/StreamHelpers.h $(includedir)/IceUtil/ScopedArray.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/Optional.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/Version.h $(includedir)/Ice/EndpointTypes.h
		5	+Acceptor$(OBJEXT): Acceptor.cpp ../Ice/Acceptor.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h ../Ice/AcceptorF.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h ../Ice/TransceiverF.h ../Ice/Network.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/EndpointF.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/Exception.h $(includedir)/Ice/Format.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/LocalObjectF.h $(includedir)/Ice/StreamHelpers.h $(includedir)/IceUtil/ScopedArray.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/Optional.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/Version.h $(includedir)/Ic
0	e/EndpointTypes.h	6	e/EndpointTypes.h
		7	Application$(OBJEXT): Application.cpp $(includedir)/Ice/Application.h $(includedir)/Ice/Ice.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/ProxyF.h $(includedir)/IceUtil/Shared.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/Handle.h $(includedir)/Ice/Exception.h $(includedir)/Ice/Format.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/LocalObjectF.h $(includedir)/Ice/StreamHelpers.h $(includedir)/IceUtil/ScopedArray.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/Optional.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/InstrumentationF.h $(includedir)/Ice/Dispatcher.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/StringConvert
1	er.h $(includedir)/Ice/Plugin.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/FactoryTable.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/IceUtil/MutexProtocol.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Version.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Identity.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/EndpointF.h $(includedir)/Ice/EndpointTypes.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/IceUtil/UniquePtr.h $(includedir)/Ice/	8	er.h $(includedir)/Ice/Plugin.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/FactoryTable.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/IceUtil/MutexProtocol.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Version.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Identity.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/EndpointF.h $(includedir)/Ice/EndpointTypes.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/IceUtil/UniquePtr.h $(includedir)/Ice/
2	OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/Object.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/ObjectFactoryManagerF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/SlicedDataF.h $(includedir)/Ice/ObserverHelper.h $(includedir)/Ice/Instrumentation.h $(includedir)/Ice/Outgoing.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/CommunicatorAsync.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/Endpoint.h $(i	9	OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/Object.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/ObjectFactoryManagerF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/SlicedDataF.h $(includedir)/Ice/ObserverHelper.h $(includedir)/Ice/Instrumentation.h $(includedir)/Ice/Outgoing.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/CommunicatorAsync.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/Endpoint.h $(i
3	ncludedir)/Ice/ServantLocator.h $(includedir)/Ice/SlicedData.h $(includedir)/Ice/Process.h $(includedir)/Ice/Connection.h $(includedir)/Ice/ConnectionAsync.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/FactoryTableInit.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/PropertiesAdmin.h $(includedir)/Ice/Metrics.h $(includedir)/Ice/Service.h $(includedir)/Ice/IconvStringConverter.h ../Ice/LoggerI.h $(includedir)/IceUtil/FileUtil.h $(includedir)/IceUtil/CtrlCHandler.h $(includedir)/IceUtil/ArgVector.h ../Ice/GC.h	10	ncludedir)/Ice/ServantLocator.h $(includedir)/Ice/SlicedData.h $(includedir)/Ice/Process.h $(includedir)/Ice/Connection.h $(includedir)/Ice/ConnectionAsync.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/FactoryTableInit.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/PropertiesAdmin.h $(includedir)/Ice/Metrics.h $(includedir)/Ice/Service.h $(includedir)/Ice/IconvStringConverter.h ../Ice/LoggerI.h $(includedir)/IceUtil/FileUtil.h $(includedir)/IceUtil/CtrlCHandler.h $(includedir)/IceUtil/ArgVector.h ../Ice/GC.h
		11	Base64$(OBJEXT): Base64.cpp ../Ice/Base64.h $(includedir)/Ice/Config.h $(includedir)/IceUtil/Config.h
		12	Buffer$(OBJEXT): Buffer.cpp $(includedir)/Ice/Buffer.h $(includedir)/Ice/Config.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/ProxyF.h $(includedir)/IceUtil/Shared.h $(includedir)/Ice/ProxyHandle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/Handle.h $(includedir)/Ice/Exception.h $(includedir)/Ice/Format.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/LocalObjectF.h $(includedir)/Ice/StreamHelpers.h $(includedir)/IceUtil/ScopedArray.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/Optional.h $(includedir)/Ice/Identity.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/Version.h $(includedir)/Ice/BuiltinSequences.h




--- cpp.orig/src/Ice/ConnectionI.cpp	2011-06-15 21:43:58.000000000 +0200
+++ cpp/src/Ice/ConnectionI.cpp	2012-03-04 20:14:52.000000000 +0100
@@ -31,7 +31,7 @@
 using namespace Ice;
 using namespace IceInternal;
 
-Ice::LocalObject* IceInternal::upCast(ConnectionI* p) { return p; }
+Ice::LocalObject* Ice::upCast(ConnectionI* p) { return p; }
 
 namespace
 {
@@ -600,6 +600,7 @@
     }
     catch(const LocalException& ex)
     {
+        status = IceInternal::AsyncStatusQueued; // this is only to apeace the compiler
         setState(StateClosed, ex);
         assert(_exception.get());
         _exception->ice_throw();
@@ -971,6 +972,7 @@
     }
     catch(const Ice::LocalException& ex)
     {
+        status = IceInternal::AsyncStatusQueued; // this is only to apeace the compiler
         setState(StateClosed, ex);
         assert(_exception.get());
         _exception->ice_throw();

Lines 1-11 Link Here

(-)./files/patch-cpp-src-Ice-IncomingAsync.cpp (-11 lines)
1	--- cpp.orig/src/Ice/IncomingAsync.cpp 2011-06-15 21:43:58.000000000 +0200
2	+++ cpp/src/Ice/IncomingAsync.cpp 2012-03-04 20:14:52.000000000 +0100
3	@@ -24,7 +24,7 @@
4	using namespace IceInternal;
5
6	IceUtil::Shared* IceInternal::upCast(IncomingAsync* p) { return p; }
7	-IceUtil::Shared* IceInternal::upCast(AMD_Object_ice_invoke* p) { return p; }
8	+IceUtil::Shared* Ice::upCast(AMD_Object_ice_invoke* p) { return p; }
9
10	namespace
11	{

Lines 1-11 Link Here

(-)./files/patch-cpp-src-Ice-LocalObject.cpp (-11 lines)
1	--- cpp.orig/src/Ice/LocalObject.cpp 2011-06-15 21:43:58.000000000 +0200
2	+++ cpp/src/Ice/LocalObject.cpp 2012-03-04 20:14:52.000000000 +0100
3	@@ -13,7 +13,7 @@
4	using namespace Ice;
5	using namespace IceInternal;
6
7	-IceUtil::Shared* IceInternal::upCast(LocalObject* obj) { return obj; }
8	+IceUtil::Shared* Ice::upCast(LocalObject* obj) { return obj; }
9
10	bool
11	Ice::LocalObject::operator==(const LocalObject& r) const




--- cpp.orig/src/Ice/Network.cpp	2013-03-11 15:19:46.000000000 +0000
+++ cpp/src/Ice/Network.cpp	2013-05-19 22:55:40.257195813 +0000
@@ -936,7 +936,11 @@
     WSASetLastError(error);
 #else
     int error = errno;

     {
         SocketException ex(__FILE__, __LINE__);
         ex.error = getSocketErrno();
@@ -1098,7 +1098,7 @@ IceInternal::doBind(SOCKET fd, const struct sockaddr_storage& addr)
         size = 0; // Keep the compiler happy.
     }
 
-    if(bind(fd, reinterpret_cast<const struct sockaddr*>(&addr), size) == SOCKET_ERROR)
+    if(::bind(fd, reinterpret_cast<const struct sockaddr*>(&addr), size) == SOCKET_ERROR)
     {
         closeSocketNoThrow(fd);
         SocketException ex(__FILE__, __LINE__);

Lines 1-11 Link Here

(-)./files/patch-cpp-src-Ice-Object.cpp (-11 lines)
1	--- cpp.orig/src/Ice/Object.cpp 2011-06-15 21:43:58.000000000 +0200
2	+++ cpp/src/Ice/Object.cpp 2012-03-04 20:14:52.000000000 +0100
3	@@ -19,7 +19,7 @@
4	using namespace Ice;
5	using namespace IceInternal;
6
7	-IceUtil::Shared* IceInternal::upCast(Object* p) { return p; }
8	+IceUtil::Shared* Ice::upCast(Object* p) { return p; }
9
10	bool
11	Ice::Object::operator==(const Object& r) const

Lines 1-11 Link Here

(-)./files/patch-cpp-src-Ice-OutgoingAsync.cpp (-11 lines)
1	--- cpp.orig/src/Ice/OutgoingAsync.cpp 2011-06-15 21:43:59.000000000 +0200
2	+++ cpp/src/Ice/OutgoingAsync.cpp 2012-03-04 20:14:52.000000000 +0100
3	@@ -30,7 +30,7 @@
4	using namespace Ice;
5	using namespace IceInternal;
6
7	-IceUtil::Shared* IceInternal::upCast(AsyncResult* p) { return p; }
8	+IceUtil::Shared* Ice::upCast(AsyncResult* p) { return p; }
9
10	IceUtil::Shared* IceInternal::upCast(OutgoingAsyncMessageCallback* p) { return p; }
11	IceUtil::Shared* IceInternal::upCast(OutgoingAsync* p) { return p; }




--- cpp.orig/src/Ice/PropertyNames.cpp	2011-06-15 21:43:59.000000000 +0200
+++ cpp/src/Ice/PropertyNames.cpp	2012-03-04 19:55:44.000000000 +0100
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 //
-// Generated by makeprops.py from file ..\config\PropertyNames.xml, Mon May 09 07:39:43 2011
+// Generated by makeprops.py from file ../config/PropertyNames.xml, Tue Jul 12 07:22:34 2011
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -335,6 +335,8 @@
     IceInternal::Property("IceGrid.Registry.PermissionsVerifier", false, 0),
     IceInternal::Property("IceGrid.Registry.ReplicaName", false, 0),
     IceInternal::Property("IceGrid.Registry.ReplicaSessionTimeout", false, 0),
+    IceInternal::Property("IceGrid.Registry.RequireNodeCertCN", false, 0),
+    IceInternal::Property("IceGrid.Registry.RequireReplicaCertCN", false, 0),
     IceInternal::Property("IceGrid.Registry.Server.ACM", false, 0),
     IceInternal::Property("IceGrid.Registry.Server.AdapterId", false, 0),
     IceInternal::Property("IceGrid.Registry.Server.Endpoints", false, 0),

Lines 1-11 Link Here

(-)./files/patch-cpp-src-Ice-PropertyNames.h (-11 lines)
1	--- cpp.orig/src/Ice/PropertyNames.h 2011-06-15 21:43:59.000000000 +0200
2	+++ cpp/src/Ice/PropertyNames.h 2012-03-04 19:55:44.000000000 +0100
3	@@ -8,7 +8,7 @@
4	// **********************************************************************
5
6	//
7	-// Generated by makeprops.py from file ..\config\PropertyNames.xml, Mon May 09 07:39:43 2011
8	+// Generated by makeprops.py from file ../config/PropertyNames.xml, Tue Jul 12 07:22:34 2011
9
10	// IMPORTANT: Do not edit this file -- any edits made here will be lost!
11

Lines 1-32 Link Here

(-)./files/patch-cpp-src-Ice-Service.cpp (-32 lines)
1	--- cpp.orig/src/Ice/Service.cpp 2011-06-15 21:43:59.000000000 +0200
2	+++ cpp/src/Ice/Service.cpp 2012-03-04 20:14:53.000000000 +0100
3	@@ -2136,17 +2136,26 @@
4	//
5	// Associate stdin, stdout and stderr with /dev/null.
6	//
7	+#ifndef NDEBUG
8	int fd;
9	- fd = open("/dev/null", O_RDWR);
10	+ fd =
11	+#endif
12	+ open("/dev/null", O_RDWR);
13	assert(fd == 0);
14	if(stdOut.empty())
15	{
16	- fd = dup2(0, 1);
17	+#ifndef NDEBUG
18	+ fd =
19	+#endif
20	+ dup2(0, 1);
21	assert(fd == 1);
22	}
23	if(stdErr.empty())
24	{
25	- fd = dup2(1, 2);
26	+#ifndef NDEBUG
27	+ fd =
28	+#endif
29	+ dup2(1, 2);
30	assert(fd == 2);
31	}
32	}




--- cpp.orig/src/Ice/Stream.cpp	2011-06-15 21:43:59.000000000 +0200
+++ cpp/src/Ice/Stream.cpp	2012-03-04 20:14:53.000000000 +0100
@@ -8,10 +8,19 @@
 // **********************************************************************
 
 #include <Ice/Stream.h>
+#include <Ice/LocalException.h>
 
 using namespace std;
 using namespace Ice;
 using namespace IceInternal;
 
-IceUtil::Shared* IceInternal::upCast(InputStream* p) { return p; }
-IceUtil::Shared* IceInternal::upCast(OutputStream* p) { return p; }
+IceUtil::Shared* Ice::upCast(InputStream* p) { return p; }
+IceUtil::Shared* Ice::upCast(OutputStream* p) { return p; }
+
+namespace IceInternal
+{
+  void delegateThrowMarshalException(const char* file, int line , const ::std::string& message)
+  {
+    throw Ice::MarshalException(file, line, message);
+  }
+}




--- cpp.orig/src/IceGrid/AdminCallbackRouter.cpp	2011-06-15 21:43:59.000000000 +0200
+++ cpp/src/IceGrid/AdminCallbackRouter.cpp	2012-03-04 20:14:53.000000000 +0100
@@ -49,7 +49,12 @@
 #ifndef NDEBUG
     bool inserted =
 #endif
-        _categoryToConnection.insert(map<string, ConnectionPtr>::value_type(category, con)).second;
+        _categoryToConnection.insert(map<string, ConnectionPtr>::value_type(category, con))
+#ifndef NDEBUG
+        .second
+#endif
+        ;
+
     
     assert(inserted == true);
 }




--- cpp.orig/src/IceGrid/DescriptorHelper.cpp	2011-06-15 21:43:59.000000000 +0200
+++ cpp/src/IceGrid/DescriptorHelper.cpp	2012-03-04 20:14:53.000000000 +0100
@@ -198,15 +198,6 @@
     return result;
 }
 
-template<typename Dict> Dict
-getDictUpdatedElts(const Dict& ldict, const Dict& rdict)
-{
-#if defined(_MSC_VER) && (_MSC_VER < 1300)
-    return getDictUpdatedEltsWithEq(ldict, rdict, equal_to<Dict::mapped_type>());
-#else
-    return getDictUpdatedEltsWithEq(ldict, rdict, equal_to<typename Dict::mapped_type>());
-#endif
-}
 
 template<typename EqFunc, typename Dict> Dict
 getDictUpdatedEltsWithEq(const Dict& ldict, const Dict& rdict, EqFunc eq)
@@ -223,6 +214,16 @@
     return result;
 }
 
+template<typename Dict> Dict
+getDictUpdatedElts(const Dict& ldict, const Dict& rdict)
+{
+#if defined(_MSC_VER) && (_MSC_VER < 1300)
+    return getDictUpdatedEltsWithEq(ldict, rdict, equal_to<Dict::mapped_type>());
+#else
+    return getDictUpdatedEltsWithEq(ldict, rdict, equal_to<typename Dict::mapped_type>());
+#endif
+}
+
 template <typename Dict> Ice::StringSeq
 getDictRemovedElts(const Dict& ldict, const Dict& rdict)
 {

Lines 1-20 Link Here

(-)./files/patch-cpp-src-IceGrid-FileCache.cpp (-12 / +8 lines)
1	--- cpp.orig/src/IceGrid/FileCache.cpp 2011-06-15 21:43:58.000000000 +0200	1	--- cpp.orig/src/IceGrid/FileCache.cpp 2013-03-11 15:19:12.271195149 +0000
2	+++ cpp/src/IceGrid/FileCache.cpp 2012-09-10 11:43:58.000000000 +0200	2	+++ cpp/src/IceGrid/FileCache.cpp 2013-06-01 17:47:48.636196265 +0000
3	@@ -195,15 +195,12 @@ FileCache::read(const string& file, Ice::Long offset, int size, Ice::Long& newOf	3	@@ -195,11 +195,11 @@
4		4	// Some eofbit cases will also set failbit. So first
5	totalSize += lineSize;	5	// check eof.
6	lines.push_back(line);	6	//
7	-#if defined(_MSC_VER) && (_MSC_VER < 1300)
8	- if(is.eof())	7	- if(is.eof())
9	+
10	+ if(is.eof() \|\| is.fail())	8	+ if(is.eof() \|\| is.fail())
11	{	9	{
12	newOffset += line.size();	10	newOffset += line.size();
13	}	11	}
14	else	12	- else if(!is.fail())
15	-#else	13	+ else
16	- if(!is.fail())
17	-#endif
18	{	14	{
19	newOffset = is.tellg();	15	newOffset = is.tellg();
20	}	16	}




--- cpp.orig/src/IceGrid/Internal.ice	2011-06-15 21:43:59.000000000 +0200
+++ cpp/src/IceGrid/Internal.ice	2012-03-04 19:55:44.000000000 +0100
@@ -702,7 +702,7 @@
      *
      **/
     NodeSession* registerNode(InternalNodeInfo info, Node* prx, LoadInfo loadInf)
-        throws NodeActiveException;
+        throws NodeActiveException, PermissionDeniedException;
 
     /**
      *
@@ -721,7 +721,7 @@
      *
      **/
     ReplicaSession* registerReplica(InternalReplicaInfo info, InternalRegistry* prx)
-        throws ReplicaActiveException;
+        throws ReplicaActiveException, PermissionDeniedException;
 
     /**
      *




--- cpp.orig/src/IceGrid/InternalRegistryI.cpp	2011-06-15 21:43:59.000000000 +0200
+++ cpp/src/IceGrid/InternalRegistryI.cpp	2012-03-04 19:55:44.000000000 +0100
@@ -19,6 +19,8 @@
 #include <IceGrid/ReplicaSessionI.h>
 #include <IceGrid/ReplicaSessionManager.h>
 #include <IceGrid/FileCache.h>
+#include <IceSSL/IceSSL.h>
+#include <IceSSL/RFC2253.h>
 
 using namespace std;
 using namespace IceGrid;
@@ -38,6 +40,8 @@
     Ice::PropertiesPtr properties = database->getCommunicator()->getProperties();
     _nodeSessionTimeout = properties->getPropertyAsIntWithDefault("IceGrid.Registry.NodeSessionTimeout", 30);
     _replicaSessionTimeout = properties->getPropertyAsIntWithDefault("IceGrid.Registry.ReplicaSessionTimeout", 30);
+    _requireNodeCertCN = properties->getPropertyAsIntWithDefault("IceGrid.Registry.RequireNodeCertCN", 0);
+    _requireReplicaCertCN = properties->getPropertyAsIntWithDefault("IceGrid.Registry.RequireReplicaCertCN", 0);
 }
 
 InternalRegistryI::~InternalRegistryI()
@@ -50,7 +54,56 @@
                                 const LoadInfo& load, 
                                 const Ice::Current& current)
 {
-    const Ice::LoggerPtr logger = _database->getTraceLevels()->logger;
+    const TraceLevelsPtr traceLevels = _database->getTraceLevels();
+    const Ice::LoggerPtr logger = traceLevels->logger;
+    if(!info || !node)
+    {
+        return 0;
+    }
+
+    if(_requireNodeCertCN)
+    {
+        try
+        {
+            IceSSL::ConnectionInfoPtr sslConnInfo = IceSSL::ConnectionInfoPtr::dynamicCast(current.con->getInfo());
+            if(sslConnInfo)
+            {
+                if (sslConnInfo->certs.empty() ||
+                    !IceSSL::Certificate::decode(sslConnInfo->certs[0])->getSubjectDN().match("CN=" + info->name))
+                {
+                    if(traceLevels->node > 0)
+                    {
+                        Ice::Trace out(logger, traceLevels->nodeCat);
+                        out << "certificate CN doesn't match node name `" << info->name << "'";
+                    }
+                    throw PermissionDeniedException("certificate CN doesn't match node name `" + info->name + "'");
+                }
+            }
+            else
+            {
+                if(traceLevels->node > 0)
+                {
+                    Ice::Trace out(logger, traceLevels->nodeCat);
+                    out << "node certificate for `" << info->name << "' is required to connect to this registry";
+                }
+                throw PermissionDeniedException("node certificate is required to connect to this registry");
+            }
+        }
+        catch(const PermissionDeniedException& ex)
+        {
+            throw ex;
+        }
+        catch(const IceUtil::Exception&)
+        {
+            if(traceLevels->node > 0)
+            {
+                Ice::Trace out(logger, traceLevels->nodeCat);
+                out << "unexpected exception while verifying certificate for node `" << info->name << "'";
+            }
+            throw PermissionDeniedException("unable to verify certificate for node `" + info->name + "'");
+        }
+    }
+ 
     try
     {
         NodeSessionIPtr session = new NodeSessionI(_database, node, info, _nodeSessionTimeout, load);
@@ -68,7 +121,56 @@
                                    const InternalRegistryPrx& prx,
                                    const Ice::Current& current)
 {
-    const Ice::LoggerPtr logger = _database->getTraceLevels()->logger;
+    const TraceLevelsPtr traceLevels = _database->getTraceLevels();
+    const Ice::LoggerPtr logger = traceLevels->logger;
+    if(!info || !prx)
+    {
+        return 0;
+    }
+
+    if(_requireReplicaCertCN)
+    {
+        try
+        {
+            IceSSL::ConnectionInfoPtr sslConnInfo = IceSSL::ConnectionInfoPtr::dynamicCast(current.con->getInfo());
+            if(sslConnInfo)
+            {
+                if (sslConnInfo->certs.empty() ||
+                    !IceSSL::Certificate::decode(sslConnInfo->certs[0])->getSubjectDN().match("CN=" + info->name))
+                {
+                    if(traceLevels->replica > 0)
+                    {
+                        Ice::Trace out(logger, traceLevels->replicaCat);
+                        out << "certificate CN doesn't match replica name `" << info->name << "'";
+                    }
+                    throw PermissionDeniedException("certificate CN doesn't match replica name `" + info->name + "'");
+                }
+            }
+            else
+            {
+                if(traceLevels->replica > 0)
+                {
+                    Ice::Trace out(logger, traceLevels->replicaCat);
+                    out << "replica certificate for `" << info->name << "' is required to connect to this registry";
+                }
+                throw PermissionDeniedException("replica certificate is required to connect to this registry");
+            }
+        }
+        catch(const PermissionDeniedException& ex)
+        {
+            throw ex;
+        }
+        catch(const IceUtil::Exception&)
+        {
+            if(traceLevels->replica > 0)
+            {
+                Ice::Trace out(logger, traceLevels->replicaCat);
+                out << "unexpected exception while verifying certificate for replica `" << info->name << "'";
+            }
+            throw PermissionDeniedException("unable to verify certificate for replica `" + info->name + "'");
+        }
+    }
+    
     try
     {
         ReplicaSessionIPtr s = new ReplicaSessionI(_database, _wellKnownObjects, info, prx, _replicaSessionTimeout);

Lines 1-11 Link Here

(-)./files/patch-cpp-src-IceGrid-InternalRegistryI.h (-11 lines)
1	--- cpp.orig/src/IceGrid/InternalRegistryI.h 2011-06-15 21:43:59.000000000 +0200
2	+++ cpp/src/IceGrid/InternalRegistryI.h 2012-03-04 19:55:44.000000000 +0100
3	@@ -68,6 +68,8 @@
4	ReplicaSessionManager& _session;
5	int _nodeSessionTimeout;
6	int _replicaSessionTimeout;
7	+ bool _requireNodeCertCN;
8	+ bool _requireReplicaCertCN;
9	};
10
11	};




--- cpp.orig/src/IceGrid/NodeSessionManager.cpp	2011-06-15 21:43:59.000000000 +0200
+++ cpp/src/IceGrid/NodeSessionManager.cpp	2012-03-04 19:55:44.000000000 +0100
@@ -110,6 +110,14 @@
         }
         exception.reset(ex.ice_clone());
     }
+    catch(const PermissionDeniedException& ex)
+    {
+        if(traceLevels)
+        { 
+            traceLevels->logger->error("connection to the the registry `" + _name + "' was denied:\n" + ex.reason);
+        }
+        exception.reset(ex.ice_clone());
+    }
     catch(const Ice::Exception& ex)
     {
         exception.reset(ex.ice_clone());

Lines 1-11 Link Here

(-)./files/patch-cpp-src-IceGrid-ReplicaCache.cpp (-11 lines)
1	--- cpp.orig/src/IceGrid/ReplicaCache.cpp 2011-06-15 21:43:59.000000000 +0200
2	+++ cpp/src/IceGrid/ReplicaCache.cpp 2012-03-04 20:14:53.000000000 +0100
3	@@ -40,7 +40,7 @@
4	Lock sync(*this);
5
6	ReplicaEntryPtr entry;
7	- while(entry = getImpl(name))
8	+ while((entry = getImpl(name)))
9	{
10	ReplicaSessionIPtr session = entry->getSession();
11	if(session->isDestroyed())




--- cpp.orig/src/IceGrid/ReplicaSessionManager.cpp	2011-06-15 21:43:59.000000000 +0200
+++ cpp/src/IceGrid/ReplicaSessionManager.cpp	2012-03-04 19:55:44.000000000 +0100
@@ -500,6 +500,14 @@
         }
         exception.reset(ex.ice_clone());
     }
+    catch(const PermissionDeniedException& ex)
+    {
+        if(_traceLevels)
+        {
+            _traceLevels->logger->error("connection to the the registry `" + _name + "' was denied:\n" + ex.reason);
+        }
+        exception.reset(ex.ice_clone());
+    }
     catch(const Ice::Exception& ex)
     {
         exception.reset(ex.ice_clone());

Lines 1-11 Link Here

(-)./files/patch-cpp-src-IceGrid-SessionI.h (-11 lines)
1	--- cpp.orig/src/IceGrid/SessionI.h 2011-06-15 21:43:59.000000000 +0200
2	+++ cpp/src/IceGrid/SessionI.h 2012-03-04 20:14:53.000000000 +0100
3	@@ -35,7 +35,7 @@
4	class SessionI;
5	typedef IceUtil::Handle<SessionI> SessionIPtr;
6
7	-class BaseSessionI : virtual Ice::Object, public IceUtil::Mutex
8	+class BaseSessionI : virtual public Ice::Object, public IceUtil::Mutex
9	{
10	public:
11

Lines 1-11 Link Here

(-)./files/patch-cpp-src-IceSSL-Instance.cpp (-11 lines)
1	--- cpp.orig/src/IceSSL/Instance.cpp 2011-06-15 21:43:59.000000000 +0200
2	+++ cpp/src/IceSSL/Instance.cpp 2012-03-04 20:14:53.000000000 +0100
3	@@ -38,7 +38,7 @@
4	using namespace Ice;
5	using namespace IceSSL;
6
7	-IceUtil::Shared* IceInternal::upCast(IceSSL::Instance* p) { return p; }
8	+IceUtil::Shared* IceSSL::upCast(IceSSL::Instance* p) { return p; }
9
10	namespace
11	{




--- cpp.orig/src/IceSSL/InstanceF.h	2011-06-15 21:43:59.000000000 +0200
+++ cpp/src/IceSSL/InstanceF.h	2012-03-04 20:14:53.000000000 +0100
@@ -18,13 +18,13 @@
 {
 
 class Instance;
+IceUtil::Shared* upCast(IceSSL::Instance*);
 
 }
 
 namespace IceInternal
 {
 
-IceUtil::Shared* upCast(IceSSL::Instance*);
 
 }
 

Lines 1-11 Link Here

(-)./files/patch-cpp-src-IceSSL-TrustManager.cpp (-11 lines)
1	--- cpp.orig/src/IceSSL/TrustManager.cpp 2011-06-15 21:43:59.000000000 +0200
2	+++ cpp/src/IceSSL/TrustManager.cpp 2012-03-04 20:14:53.000000000 +0100
3	@@ -20,7 +20,7 @@
4	using namespace std;
5	using namespace IceSSL;
6
7	-IceUtil::Shared* IceInternal::upCast(IceSSL::TrustManager* p) { return p; }
8	+IceUtil::Shared* IceSSL::upCast(IceSSL::TrustManager* p) { return p; }
9
10	TrustManager::TrustManager(const Ice::CommunicatorPtr& communicator) :
11	_communicator(communicator)




--- cpp.orig/src/IceSSL/TrustManagerF.h	2011-06-15 21:43:59.000000000 +0200
+++ cpp/src/IceSSL/TrustManagerF.h	2012-03-04 20:14:53.000000000 +0100
@@ -18,13 +18,13 @@
 {
 
 class TrustManager;
+IceUtil::Shared* upCast(IceSSL::TrustManager*);
 
 }
 
 namespace IceInternal
 {
 
-IceUtil::Shared* upCast(IceSSL::TrustManager*);
 
 }
 

Lines 1-11 Link Here

(-)./files/patch-cpp-src-IceSSL-Util.cpp (-11 lines)
1	--- cpp.orig/src/IceSSL/Util.cpp 2011-06-15 21:43:59.000000000 +0200
2	+++ cpp/src/IceSSL/Util.cpp 2012-03-04 20:14:53.000000000 +0100
3	@@ -175,7 +175,7 @@
4	return dh;
5	}
6
7	-IceUtil::Shared* IceInternal::upCast(IceSSL::DHParams* p) { return p; }
8	+IceUtil::Shared* IceSSL::upCast(IceSSL::DHParams* p) { return p; }
9
10	IceSSL::DHParams::DHParams() :
11	_dh512(0), _dh1024(0), _dh2048(0), _dh4096(0)




--- cpp.orig/src/IceSSL/UtilF.h	2011-06-15 21:43:59.000000000 +0200
+++ cpp/src/IceSSL/UtilF.h	2012-03-04 20:14:53.000000000 +0100
@@ -21,13 +21,13 @@
 {
 
 class DHParams;
+IceUtil::Shared* upCast(IceSSL::DHParams*);
 
 }
 
 namespace IceInternal
 {
 
-IceUtil::Shared* upCast(IceSSL::DHParams*);
 
 }
 




--- cpp.orig/src/IceStorm/NodeI.cpp	2011-06-15 21:43:59.000000000 +0200
+++ cpp/src/IceStorm/NodeI.cpp	2012-03-04 20:14:53.000000000 +0100
@@ -18,11 +18,6 @@
 namespace
 {
 
-bool operator==(const GroupNodeInfo& info, int id)
-{
-    return info.id == id;
-}
-
 class CheckTask : public IceUtil::TimerTask
 {
     const NodeIPtr _node;




--- cpp.orig/src/IceStorm/Replica.h	2011-06-15 21:43:58.000000000 +0200
+++ cpp/src/IceStorm/Replica.h	2012-09-10 11:43:58.000000000 +0200
@@ -23,9 +23,9 @@ struct GroupNodeInfo
     GroupNodeInfo(int i, LogUpdate l, const Ice::ObjectPrx& o = Ice::ObjectPrx());
     bool operator<(const GroupNodeInfo& rhs) const;
     bool operator==(const GroupNodeInfo& rhs) const;
-    const int id;
-    const LogUpdate llu;
-    const Ice::ObjectPrx observer;
+    int id;
+    LogUpdate llu;
+    Ice::ObjectPrx observer;
 };
 
 class Replica : virtual public IceUtil::Shared




--- cpp.orig/src/IceStorm/TopicI.cpp	2011-06-15 21:43:58.000000000 +0200
+++ cpp/src/IceStorm/TopicI.cpp	2012-09-12 22:14:00.000000000 +0200
@@ -666,7 +666,7 @@ TopicImpl::subscribe(const QoS& origQoS, const Ice::ObjectPrx& obj)
         {
             try
             {
-                DatabaseConnectionPtr connection = _databaseCache->getConnection();
+                DatabaseConnectionPtr connection = _databaseCache->newConnection();
                 TransactionHolder txn(connection);
 
                 SubscriberRecordKey key;
@@ -703,7 +703,7 @@ TopicImpl::subscribe(const QoS& origQoS, const Ice::ObjectPrx& obj)
     {
         try
         {
-            DatabaseConnectionPtr connection = _databaseCache->getConnection();
+            DatabaseConnectionPtr connection = _databaseCache->newConnection();
             TransactionHolder txn(connection);
 
             SubscriberRecordKey key;
@@ -788,7 +788,7 @@ TopicImpl::subscribeAndGetPublisher(const QoS& qos, const Ice::ObjectPrx& obj)
     {
         try
         {
-            DatabaseConnectionPtr connection = _databaseCache->getConnection();
+            DatabaseConnectionPtr connection = _databaseCache->newConnection();
             TransactionHolder txn(connection);
 
             SubscriberRecordKey key;
@@ -912,7 +912,7 @@ TopicImpl::link(const TopicPrx& topic, Ice::Int cost)
     {
         try
         {
-            DatabaseConnectionPtr connection = _databaseCache->getConnection();
+            DatabaseConnectionPtr connection = _databaseCache->newConnection();
             TransactionHolder txn(connection);
 
             SubscriberRecordKey key;
@@ -1311,7 +1311,7 @@ TopicImpl::observerAddSubscriber(const LogUpdate& llu, const SubscriberRecord& r
     {
         try
         {
-            DatabaseConnectionPtr connection = _databaseCache->getConnection();
+            DatabaseConnectionPtr connection = _databaseCache->newConnection();
             TransactionHolder txn(connection);
 
             SubscriberRecordKey key;
@@ -1380,7 +1380,7 @@ TopicImpl::observerRemoveSubscriber(const LogUpdate& llu, const Ice::IdentitySeq
     {
         try
         {
-            DatabaseConnectionPtr connection = _databaseCache->getConnection();
+            DatabaseConnectionPtr connection = _databaseCache->newConnection();
             TransactionHolder txn(connection);
 
             for(Ice::IdentitySeq::const_iterator id = ids.begin(); id != ids.end(); ++id)
@@ -1456,7 +1456,7 @@ TopicImpl::destroyInternal(const LogUpdate& origLLU, bool master)
     {
         try
         {
-            DatabaseConnectionPtr connection = _databaseCache->getConnection();
+            DatabaseConnectionPtr connection = _databaseCache->newConnection();
             TransactionHolder txn(connection);
 
             // Erase all subscriber records and the topic record.
@@ -1531,7 +1531,7 @@ TopicImpl::removeSubscribers(const Ice::IdentitySeq& ids)
     {
         try
         {
-            DatabaseConnectionPtr connection = _databaseCache->getConnection();
+            DatabaseConnectionPtr connection = _databaseCache->newConnection();
             TransactionHolder txn(connection);
 
             for(Ice::IdentitySeq::const_iterator id = ids.begin(); id != ids.end(); ++id)




--- cpp.orig/src/IceStorm/TopicManagerI.cpp	2011-06-15 21:43:58.000000000 +0200
+++ cpp/src/IceStorm/TopicManagerI.cpp	2012-09-12 22:14:00.000000000 +0200
@@ -312,7 +312,7 @@ TopicManagerImpl::TopicManagerImpl(const InstancePtr& instance) :
             _sync = _instance->nodeAdapter()->addWithUUID(_syncImpl);
         }
 
-        DatabaseConnectionPtr connection = _databaseCache->getConnection();
+        DatabaseConnectionPtr connection = _databaseCache->newConnection();
 
         // Ensure that the llu counter is present in the log.
         LLUWrapperPtr lluWrapper = _databaseCache->getLLU(connection);
@@ -381,7 +381,7 @@ TopicManagerImpl::create(const string& name)
     {
         try
         {
-            DatabaseConnectionPtr connection = _databaseCache->getConnection();
+            DatabaseConnectionPtr connection = _databaseCache->newConnection();
             TransactionHolder txn(connection);
 
             SubscriberRecordKey key;
@@ -486,7 +486,7 @@ TopicManagerImpl::observerInit(const LogUpdate& llu, const TopicContentSeq& cont
     {
         try
         {
-            DatabaseConnectionPtr connection = _databaseCache->getConnection();
+            DatabaseConnectionPtr connection = _databaseCache->newConnection();
             TransactionHolder txn(connection);
 
             LLUWrapperPtr lluWrapper = _databaseCache->getLLU(connection);
@@ -590,7 +590,7 @@ TopicManagerImpl::observerCreateTopic(const LogUpdate& llu, const string& name)
     {
         try
         {
-            DatabaseConnectionPtr connection = _databaseCache->getConnection();
+            DatabaseConnectionPtr connection = _databaseCache->newConnection();
             TransactionHolder txn(connection);
 
             SubscriberRecordKey key;
@@ -776,7 +776,7 @@ TopicManagerImpl::initMaster(const set<GroupNodeInfo>& slaves, const LogUpdate&
         {
             content.clear();
 
-            DatabaseConnectionPtr connection = _databaseCache->getConnection();
+            DatabaseConnectionPtr connection = _databaseCache->newConnection();
             TransactionHolder txn(connection);
 
             for(map<string, TopicImplPtr>::const_iterator p = _topics.begin(); p != _topics.end(); ++p)

Lines 1-15 Link Here

(-)./files/patch-cpp-src-IceUtil-Cond.cpp (-15 lines)
1	--- cpp.orig/src/IceUtil/Cond.cpp 2011-06-15 21:43:59.000000000 +0200
2	+++ cpp/src/IceUtil/Cond.cpp 2012-03-04 20:14:53.000000000 +0100
3	@@ -330,8 +330,11 @@
4
5	IceUtil::Cond::~Cond()
6	{
7	+#ifndef NDEBUG
8	int rc = 0;
9	- rc = pthread_cond_destroy(&_cond);
10	+ rc =
11	+#endif
12	+ pthread_cond_destroy(&_cond);
13	assert(rc == 0);
14	}
15




--- cpp.orig/src/IceUtil/CountDownLatch.cpp	2011-06-15 21:43:59.000000000 +0200
+++ cpp/src/IceUtil/CountDownLatch.cpp	2012-03-04 20:14:53.000000000 +0100
@@ -44,10 +44,16 @@
 #ifdef _WIN32
     CloseHandle(_event);
 #else
+#ifndef NDEBUG
     int rc = 0;
-    rc = pthread_mutex_destroy(&_mutex);
+    rc = 
+#endif
+    pthread_mutex_destroy(&_mutex);
     assert(rc == 0);
-    rc = pthread_cond_destroy(&_cond);
+#ifndef NDEBUG
+    rc = 
+#endif
+    pthread_cond_destroy(&_cond);
     assert(rc == 0);
 #endif
 }




--- cpp.orig/src/IceUtil/CtrlCHandler.cpp	2011-06-15 21:43:59.000000000 +0200
+++ cpp/src/IceUtil/CtrlCHandler.cpp	2012-03-04 20:14:53.000000000 +0100
@@ -219,29 +219,41 @@
         sigaddset(&ctrlCLikeSignals, SIGHUP);
         sigaddset(&ctrlCLikeSignals, SIGINT);
         sigaddset(&ctrlCLikeSignals, SIGTERM);
-        int rc = pthread_sigmask(SIG_BLOCK, &ctrlCLikeSignals, 0);
+#ifndef NDEBUG
+        int rc = 
+#endif        
+        pthread_sigmask(SIG_BLOCK, &ctrlCLikeSignals, 0);
         assert(rc == 0);
 
         // Joinable thread
-        rc = pthread_create(&_tid, 0, sigwaitThread, 0);
+#ifndef NDEBUG
+        rc = 
+#endif
+        pthread_create(&_tid, 0, sigwaitThread, 0);
         assert(rc == 0);
     }
 }
 
 CtrlCHandler::~CtrlCHandler()
 {
-    int rc = pthread_cancel(_tid);
+#ifndef NDEBUG
+    int rc = 
+#endif
+    pthread_cancel(_tid);
     assert(rc == 0);
 #if defined(__APPLE__)
     //
     // WORKAROUND: sigwait isn't a cancellation point on MacOS X, see
     // comment in sigwaitThread
     //
-    rc = pthread_kill(_tid, SIGTERM);
+    pthread_kill(_tid, SIGTERM);
     //assert(rc == 0); For some reaosns, this assert is sometime triggered
 #endif
     void* status = 0;
-    rc = pthread_join(_tid, &status);
+#ifndef NDEBUG
+    rc = 
+#endif
+    pthread_join(_tid, &status);
     assert(rc == 0);
 #if !defined(__APPLE__)
     assert(status == PTHREAD_CANCELED);




--- cpp.orig/src/IceUtil/FileUtil.cpp	2011-06-15 21:43:59.000000000 +0200
+++ cpp/src/IceUtil/FileUtil.cpp	2012-03-04 20:14:53.000000000 +0100
@@ -26,6 +26,10 @@
 #  include <dir.h>
 #endif
 
+#ifdef __FreeBSD__
+#  include <unistd.h>
+#endif
+
 using namespace std;
 
 //




--- cpp.orig/src/IceUtil/RecMutex.cpp	2011-06-15 21:43:59.000000000 +0200
+++ cpp/src/IceUtil/RecMutex.cpp	2012-03-04 20:14:53.000000000 +0100
@@ -148,8 +148,11 @@
 IceUtil::RecMutex::~RecMutex()
 {
     assert(_count == 0);
+#ifndef NDEBUG
     int rc = 0;
-    rc = pthread_mutex_destroy(&_mutex);
+    rc = 
+#endif
+    pthread_mutex_destroy(&_mutex);
     assert(rc == 0);
 }
 
@@ -196,8 +199,11 @@
 {
     if(--_count == 0)
     {
+#ifndef NDEBUG
         int rc = 0; // Prevent warnings when NDEBUG is defined.
-        rc = pthread_mutex_unlock(&_mutex);
+        rc = 
+#endif
+        pthread_mutex_unlock(&_mutex);
         assert(rc == 0);
     }
 }




--- cpp.orig/src/IceUtil/Shared.cpp	2011-06-15 21:43:58.000000000 +0200
+++ cpp/src/IceUtil/Shared.cpp	2012-09-10 11:43:58.000000000 +0200
@@ -96,6 +96,18 @@ IceUtil::SimpleShared::SimpleShared(const SimpleShared&) :
 {
 }
 
+IceUtil::SimpleSharedUnsafeDestructor::SimpleSharedUnsafeDestructor() :
+    _ref(0),
+    _noDelete(false)
+{
+}
+
+IceUtil::SimpleSharedUnsafeDestructor::SimpleSharedUnsafeDestructor(const SimpleSharedUnsafeDestructor&) :
+    _ref(0),
+    _noDelete(false)
+{
+}
+
 IceUtil::Shared::Shared() :
     _ref(0),
     _noDelete(false)




--- cpp.orig/src/Slice/CPlusPlusUtil.cpp	2011-06-15 21:43:59.000000000 +0200
+++ cpp/src/Slice/CPlusPlusUtil.cpp	2012-03-04 20:14:53.000000000 +0100
@@ -631,7 +631,7 @@
         string scope = fixKwd(cl->scope());
         if(marshal)
         {
-            out << nl << stream << deref << "write(::Ice::ObjectPtr(::IceInternal::upCast(" << fixedParam 
+            out << nl << stream << deref << "write(::Ice::ObjectPtr(" << scope << "upCast(" << fixedParam 
                 << ".get())));";
         }
         else
@@ -649,7 +649,7 @@
         string scope = fixKwd(px->_class()->scope());
         if(marshal)
         {
-            out << nl << stream << deref << "write(::Ice::ObjectPrx(::IceInternal::upCast(" << fixedParam 
+            out << nl << stream << deref << "write(::Ice::ObjectPrx(::IceProxy" << scope << "upCast(" << fixedParam 
                 << ".get())));";
         }
         else




--- cpp.orig/src/Slice/FileTracker.cpp	2011-06-15 21:43:59.000000000 +0200
+++ cpp/src/Slice/FileTracker.cpp	2012-03-04 20:14:53.000000000 +0100
@@ -17,6 +17,10 @@
 #   include <direct.h>
 #endif
 
+#ifdef __FreeBSD__
+#   include <unistd.h>
+#endif
+
 using namespace std;
 
 Slice::FileException::FileException(const char* file, int line, const string& r) :




--- cpp.orig/src/slice2cpp/Gen.cpp	2013-03-11 15:19:46.000000000 +0000
+++ cpp/src/slice2cpp/Gen.cpp	2013-05-20 19:51:48.109197053 +0000
@@ -385,6 +385,10 @@
         H << "\n#include <Ice/Proxy.h>";
         H << "\n#include <Ice/OutgoingAsync.h>";
     }
+    else if(p->hasNonLocalClassDecls())
     string name = fixKwd(p->name());
+    string scoped = fixKwd(p->scoped());
 
     H << sp << nl << "class " << name << ';';
+    H << nl << _dllExport << "::IceProxy::Ice::Object* upCast(::IceProxy" << scoped << "*);";
 }
 
 Slice::Gen::ProxyVisitor::ProxyVisitor(Output& h, Output& c, const string& dllExport) :
@@ -3691,10 +3693,22 @@
 Slice::Gen::ObjectDeclVisitor::visitClassDecl(const ClassDeclPtr& p)
 {
     string name = fixKwd(p->name());
+    string scoped = fixKwd(p->scoped());
 
     H << sp << nl << "class " << name << ';';
     H << nl << "bool operator==(const " << name << "&, const " << name << "&);";
     H << nl << "bool operator<(const " << name << "&, const " << name << "&);";
+
+    H << sp;
+
+    if(!p->isLocal())
+    {
+        H << "\n#include <Ice/Proxy.h>";
+    }
+    else
+    {
+        H << nl << _dllExport << "::Ice::LocalObject* upCast(" << scoped << "*);";
+    }
 }
 
 void
@@ -4922,13 +4936,13 @@
 {
     if((BuiltinPtr::dynamicCast(p) && BuiltinPtr::dynamicCast(p)->kind() == Builtin::KindObject)
        || ClassDeclPtr::dynamicCast(p))
-    {
-        C << nl << "if(" << prefix << name << ')';
+    {        C << nl << "if(" << prefix << name << ')';
         C << sb;
         ClassDeclPtr decl = ClassDeclPtr::dynamicCast(p);
         if(decl)
         {
-            C << nl << "::IceInternal::upCast(" << prefix << name << ".get())->__addObject(_c);";
+            string scope = fixKwd(decl->scope());
+            C << nl << scope << "upCast(" << prefix << name << ".get())->__addObject(_c);";
         }
         else
         {
@@ -4991,9 +5005,10 @@
         ClassDeclPtr decl = ClassDeclPtr::dynamicCast(p);
         if(decl)
         {
-            C << nl << "if(" << "::IceInternal::upCast(" << prefix << name << ".get())->__usesClasses())";
+            string scope = fixKwd(decl->scope());
+            C << nl << "if(" << scope << "upCast(" << prefix << name << ".get())->__usesClasses())";
             C << sb;
-            C << nl << "::IceInternal::upCast(" << prefix << name << ".get())->__decRefUnsafe();";
+            C << nl << scope << "upCast(" << prefix << name << ".get())->__decRefUnsafe();";
             C << nl << prefix << name << ".__clearHandleUnsafe();";
 
     if(p->hasNonLocalDataOnlyClasses() || p->hasNonLocalExceptions())
@@ -5629,40 +5644,30 @@
 {
     string scoped = fixKwd(p->scoped());
 
-    H << sp;
-
-    if(!p->isLocal())
-    {
-        H << nl << _dllExport << "::Ice::Object* upCast(" << scoped << "*);";
-        H << nl << _dllExport << "::IceProxy::Ice::Object* upCast(::IceProxy" << scoped << "*);";
-    }
-    else
-    {
-        H << nl << _dllExport << "::Ice::LocalObject* upCast(" << scoped << "*);";
-    }
 }
 
 bool
 Slice::Gen::IceInternalVisitor::visitClassDefStart(const ClassDefPtr& p)
 {
     string scoped = fixKwd(p->scoped());
+    string scope = fixKwd(p->scope());
 
     C << sp;
     if(!p->isLocal())
     {
         C << nl
 	  << (_dllExport.empty() ? "" : "ICE_DECLSPEC_EXPORT ")
-	  << "::Ice::Object* IceInternal::upCast(" << scoped << "* p) { return p; }";
+	  << "::Ice::Object* " << scope << "upCast(" << scoped << "* p) { return p; }";
         C << nl
 	  << (_dllExport.empty() ? "" : "ICE_DECLSPEC_EXPORT ")
-	  << "::IceProxy::Ice::Object* IceInternal::upCast(::IceProxy" << scoped
+	  << "::IceProxy::Ice::Object* IceProxy" << scope << "upCast(::IceProxy" << scoped
           << "* p) { return p; }";
     }
     else
     {
         C << nl
 	  << (_dllExport.empty() ? "" : "ICE_DECLSPEC_EXPORT ")
-	  << "::Ice::LocalObject* IceInternal::upCast(" << scoped << "* p) { return p; }";
+	  << "::Ice::LocalObject* " << scope << "upCast(" << scoped << "* p) { return p; }";
     }
 
     return true;




--- cpp.orig/src/slice2cpp/Main.cpp	2011-06-15 21:43:58.000000000 +0200
+++ cpp/src/slice2cpp/Main.cpp	2012-09-10 11:43:58.000000000 +0200
@@ -22,7 +22,7 @@ using namespace Slice;
 namespace
 {
 
-IceUtil::Mutex* mutex = 0;
+IceUtil::Mutex* mtx = 0;
 bool interrupted = false;
 
 class Init
@@ -31,13 +31,13 @@ public:
 
     Init()
     {
-        mutex = new IceUtil::Mutex;
+        mtx = new IceUtil::Mutex;
     }
 
     ~Init()
     {
-        delete mutex;
-        mutex = 0;
+        delete mtx;
+        mtx = 0;
     }
 };
 
@@ -48,7 +48,7 @@ Init init;
 void
 interruptedCallback(int signal)
 {
-    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex);
+    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx);
 
     interrupted = true;
 }
@@ -294,7 +294,7 @@ compile(int argc, char* argv[])
         }
 
         {
-            IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex);
+            IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx);
 
             if(interrupted)
             {




--- cpp.orig/src/slice2cs/Gen.cpp	2011-06-15 21:43:59.000000000 +0200
+++ cpp/src/slice2cs/Gen.cpp	2012-03-04 20:14:53.000000000 +0100
@@ -1281,7 +1281,7 @@
         {
             _out << value << "F";
         }
-        else if(ep = EnumPtr::dynamicCast(type))
+        else if((ep = EnumPtr::dynamicCast(type)))
         {
             string enumName = fixId(ep->scoped());
             string::size_type colon = value.rfind(':');
@@ -3914,16 +3914,6 @@
     ClassDefPtr cl = ClassDefPtr::dynamicCast(p->container());
     string name = fixId(p->name(), DotNet::ICloneable, true);
     vector<string> params = getParams(p);
-    bool hasOutParams = false;
-    ParamDeclList paramList = p->parameters();
-    for(ParamDeclList::const_iterator pli = paramList.begin(); pli != paramList.end(); ++pli)
-    {
-        if((*pli)->isOutParam())
-        {
-            hasOutParams = true;
-            break;
-        }
-    }
 
     _out << sp;
 




--- cpp.orig/src/slice2cs/Main.cpp	2011-06-15 21:43:58.000000000 +0200
+++ cpp/src/slice2cs/Main.cpp	2012-09-10 11:43:58.000000000 +0200
@@ -22,7 +22,7 @@ using namespace Slice;
 namespace
 {
 
-IceUtil::Mutex* mutex = 0;
+IceUtil::Mutex* mtx = 0;
 bool interrupted = false;
 
 class Init
@@ -31,13 +31,13 @@ public:
 
     Init()
     {
-        mutex = new IceUtil::Mutex;
+        mtx = new IceUtil::Mutex;
     }
 
     ~Init()
     {
-        delete mutex;
-        mutex = 0;
+        delete mtx;
+        mtx = 0;
     }
 };
 
@@ -48,7 +48,7 @@ Init init;
 void
 interruptedCallback(int signal)
 {
-    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex);
+    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx);
 
     interrupted = true;
 }
@@ -303,7 +303,7 @@ compile(int argc, char* argv[])
         }
 
         {
-            IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex);
+            IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx);
 
             if(interrupted)
             {




--- cpp.orig/src/slice2freeze/Main.cpp	2011-06-15 21:43:58.000000000 +0200
+++ cpp/src/slice2freeze/Main.cpp	2012-09-10 11:43:58.000000000 +0200
@@ -28,7 +28,7 @@ using namespace Slice;
 namespace
 {
 
-IceUtil::Mutex* mutex = 0;
+IceUtil::Mutex* mtx = 0;
 bool interrupted = false;
 
 class Init
@@ -37,13 +37,13 @@ public:
 
     Init()
     {
-        mutex = new IceUtil::Mutex;
+        mtx = new IceUtil::Mutex;
     }
 
     ~Init()
     {
-        delete mutex;
-        mutex = 0;
+        delete mtx;
+        mtx = 0;
     }
 };
 
@@ -56,7 +56,7 @@ string ICE_ENCODING_COMPARE = "Freeze::IceEncodingCompare";
 void
 interruptedCallback(int signal)
 {
-    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex);
+    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx);
 
     interrupted = true;
 }
@@ -1995,7 +1995,7 @@ compile(int argc, char* argv[])
         }
 
         {
-            IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex);
+            IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx);
 
             if(interrupted)
             {
@@ -2042,7 +2042,7 @@ compile(int argc, char* argv[])
     u->destroy();
 
     {
-        IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex);
+        IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx);
 
         if(interrupted)
         {




--- cpp.orig/src/slice2freezej/Main.cpp	2011-06-15 21:43:58.000000000 +0200
+++ cpp/src/slice2freezej/Main.cpp	2012-09-10 11:43:58.000000000 +0200
@@ -26,7 +26,7 @@ using namespace IceUtilInternal;
 namespace
 {
 
-IceUtil::Mutex* mutex = 0;
+IceUtil::Mutex* mtx = 0;
 bool interrupted = false;
 
 class Init
@@ -35,13 +35,13 @@ public:
 
     Init()
     {
-        mutex = new IceUtil::Mutex;
+        mtx = new IceUtil::Mutex;
     }
 
     ~Init()
     {
-        delete mutex;
-        mutex = 0;
+        delete mtx;
+        mtx = 0;
     }
 };
 
@@ -52,7 +52,7 @@ Init init;
 void
 interruptedCallback(int signal)
 {
-    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(mutex);
+    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(mtx);
 
     interrupted = true;
 }
@@ -1828,7 +1828,7 @@ compile(int argc, char* argv[])
         }
 
         {
-            IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex);
+            IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx);
 
             if(interrupted)
             {
@@ -1923,7 +1923,7 @@ compile(int argc, char* argv[])
     u->destroy();
 
     {
-        IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex);
+        IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx);
 
         if(interrupted)
         {




--- cpp.orig/src/slice2html/Main.cpp	2011-06-15 21:43:58.000000000 +0200
+++ cpp/src/slice2html/Main.cpp	2012-09-10 11:43:58.000000000 +0200
@@ -24,7 +24,7 @@ using namespace IceUtil;
 namespace
 {
 
-IceUtil::Mutex* mutex = 0;
+IceUtil::Mutex* mtx = 0;
 bool interrupted = false;
 
 class Init
@@ -33,13 +33,13 @@ public:
 
     Init()
     {
-        mutex = new IceUtil::Mutex;
+        mtx = new IceUtil::Mutex;
     }
 
     ~Init()
     {
-        delete mutex;
-        mutex = 0;
+        delete mtx;
+        mtx = 0;
     }
 };
 
@@ -50,7 +50,7 @@ Init init;
 void
 interruptedCallback(int signal)
 {
-    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex);
+    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx);
 
     interrupted = true;
 }
@@ -254,7 +254,7 @@ compile(int argc, char* argv[])
         }
 
         {
-            IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex);
+            IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx);
 
             if(interrupted)
             {
@@ -296,7 +296,7 @@ compile(int argc, char* argv[])
     p->destroy();
 
     {
-        IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex);
+        IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx);
 
         if(interrupted)
         {




--- cpp.orig/src/slice2java/Gen.cpp	2011-06-15 21:43:59.000000000 +0200
+++ cpp/src/slice2java/Gen.cpp	2012-03-04 20:14:53.000000000 +0100
@@ -1246,7 +1246,7 @@
     {
         BuiltinPtr bp;
         EnumPtr ep;
-        if(bp = BuiltinPtr::dynamicCast(type))
+        if((bp = BuiltinPtr::dynamicCast(type)))
         {
             switch(bp->kind())
             {
@@ -1349,7 +1349,7 @@
             }
 
         }
-        else if(ep = EnumPtr::dynamicCast(type))
+        else if((ep = EnumPtr::dynamicCast(type)))
         {
             string val = value;
             string::size_type pos = val.rfind(':');




--- cpp.orig/src/slice2java/Main.cpp	2011-06-15 21:43:58.000000000 +0200
+++ cpp/src/slice2java/Main.cpp	2012-09-10 11:43:58.000000000 +0200
@@ -23,7 +23,7 @@ using namespace Slice;
 namespace
 {
 
-IceUtil::Mutex* mutex = 0;
+IceUtil::Mutex* mtx = 0;
 bool interrupted = false;
 
 class Init
@@ -32,13 +32,13 @@ public:
 
     Init()
     {
-        mutex = new IceUtil::Mutex;
+        mtx = new IceUtil::Mutex;
     }
 
     ~Init()
     {
-        delete mutex;
-        mutex = 0;
+        delete mtx;
+        mtx = 0;
     }
 };
 
@@ -49,7 +49,7 @@ Init init;
 void
 interruptedCallback(int signal)
 {
-    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex);
+    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx);
 
     interrupted = true;
 }
@@ -356,7 +356,7 @@ compile(int argc, char* argv[])
         }
 
         {
-            IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex);
+            IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx);
 
             if(interrupted)
             {




--- cpp.orig/src/slice2php/Main.cpp	2011-06-15 21:43:58.000000000 +0200
+++ cpp/src/slice2php/Main.cpp	2012-09-10 11:43:58.000000000 +0200
@@ -1488,7 +1488,7 @@ printHeader(IceUtilInternal::Output& out)
 namespace
 {
 
-IceUtil::Mutex* mutex = 0;
+IceUtil::Mutex* mtx = 0;
 bool interrupted = false;
 
 class Init
@@ -1497,13 +1497,13 @@ public:
 
     Init()
     {
-        mutex = new IceUtil::Mutex;
+        mtx = new IceUtil::Mutex;
     }
 
     ~Init()
     {
-        delete mutex;
-        mutex = 0;
+        delete mtx;
+        mtx = 0;
     }
 };
 
@@ -1514,7 +1514,7 @@ Init init;
 static void
 interruptedCallback(int signal)
 {
-    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex);
+    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx);
 
     interrupted = true;
 }
@@ -1777,7 +1777,7 @@ compile(int argc, char* argv[])
         }
 
         {
-            IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex);
+            IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx);
 
             if(interrupted)
             {




--- cpp.orig/src/slice2py/Main.cpp	2011-06-15 21:43:58.000000000 +0200
+++ cpp/src/slice2py/Main.cpp	2012-09-10 11:43:58.000000000 +0200
@@ -40,7 +40,7 @@ using namespace Slice::Python;
 namespace
 {
 
-IceUtil::Mutex* mutex = 0;
+IceUtil::Mutex* mtx = 0;
 bool interrupted = false;
 
 class Init
@@ -49,13 +49,13 @@ public:
 
     Init()
     {
-        mutex = new IceUtil::Mutex;
+        mtx = new IceUtil::Mutex;
     }
 
     ~Init()
     {
-        delete mutex;
-        mutex = 0;
+        delete mtx;
+        mtx = 0;
     }
 };
 
@@ -66,7 +66,7 @@ Init init;
 void
 interruptedCallback(int signal)
 {
-    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex);
+    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx);
 
     interrupted = true;
 }
@@ -631,7 +631,7 @@ compile(int argc, char* argv[])
         }
 
         {
-            IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex);
+            IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx);
 
             if(interrupted)
             {




--- cpp.orig/src/slice2rb/Main.cpp	2011-06-15 21:43:58.000000000 +0200
+++ cpp/src/slice2rb/Main.cpp	2012-09-10 11:43:58.000000000 +0200
@@ -39,7 +39,7 @@ using namespace Slice::Ruby;
 namespace
 {
 
-IceUtil::Mutex* mutex = 0;
+IceUtil::Mutex* mtx = 0;
 bool interrupted = false;
 
 class Init
@@ -48,13 +48,13 @@ public:
 
     Init()
     {
-        mutex = new IceUtil::Mutex;
+        mtx = new IceUtil::Mutex;
     }
 
     ~Init()
     {
-        delete mutex;
-        mutex = 0;
+        delete mtx;
+        mtx = 0;
     }
 };
 
@@ -65,7 +65,7 @@ Init init;
 void
 interruptedCallback(int signal)
 {
-    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex);
+    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx);
 
     interrupted = true;
 }
@@ -316,7 +316,7 @@ compile(int argc, char* argv[])
         }
 
         {
-            IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mutex);
+            IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mtx);
 
             if(interrupted)
             {




 }
 
 }
@@ -99,7 +105,7 @@
     }
 
     virtual void
-    ice_ping(const Ice::Current& current)
+    ice_ping(const Ice::Current& current) const
     {
         testContext(_ssl, current.ctx);
     }
@@ -133,8 +139,11 @@
     {
         testContext(true, current.ctx);

Lines 1-11 Link Here

(-)./files/patch-cpp-test-Ice-background-EndpointI.h (-11 lines)
1	--- cpp.orig/test/Ice/background/EndpointI.h 2011-06-15 21:43:59.000000000 +0200
2	+++ cpp/test/Ice/background/EndpointI.h 2012-03-04 20:14:53.000000000 +0100
3	@@ -48,7 +48,7 @@
4
5	virtual Ice::Int hashInit() const;
6	#if !defined(_MSC_VER) \|\| _MSC_VER > 1300
7	- using IceInternal::EndpointI::connectors;
8	+ using ::IceInternal::EndpointI::connectors;
9	#endif
10
11	private:




--- cpp.orig/test/Ice/custom/AllTests.cpp	2011-06-15 21:43:59.000000000 +0200
+++ cpp/test/Ice/custom/AllTests.cpp	2012-03-04 20:14:53.000000000 +0100
@@ -1384,7 +1384,8 @@
                        const ::Test::ClassStructSeq& seq,
                        const InParamPtr& cookie)
     {
-        pair< ::Test::ClassStructPtr, ::Test::ClassStructSeq> in = getIn(in, cookie);
+        pair< ::Test::ClassStructPtr, ::Test::ClassStructSeq> in;
+        in = getIn(in, cookie);
         test(ret == in.first);
         test(cs1 == in.first);
         test(seq == in.second);
@@ -1432,7 +1433,8 @@
 
     void throwExcept1(const Ice::AsyncResultPtr& result)
     {
-        wstring in = getIn(in, InParamPtr::dynamicCast(result->getCookie()));
+        wstring in;
+        in = getIn(in, InParamPtr::dynamicCast(result->getCookie()));
         try
         {
             Test1::WstringClassPrx t = Test1::WstringClassPrx::uncheckedCast(result->getProxy());
@@ -1451,7 +1453,8 @@
 
     void throwExcept2(const Ice::AsyncResultPtr& result)
     {
-        wstring in = getIn(in, InParamPtr::dynamicCast(result->getCookie()));
+        wstring in;
+        in = getIn(in, InParamPtr::dynamicCast(result->getCookie()));
         try
         {
             Test2::WstringClassPrx t = Test2::WstringClassPrx::uncheckedCast(result->getProxy());




--- cpp.orig/test/Ice/metrics/AllTests.cpp	2013-03-11 15:19:47.000000000 +0000
+++ cpp/test/Ice/metrics/AllTests.cpp	2013-05-20 02:11:00.939194168 +0000
@@ -597,9 +597,12 @@
     testAttribute(clientMetrics, clientProps, update, "Connection", "incoming", "false");
     testAttribute(clientMetrics, clientProps, update, "Connection", "adapterName", "");
     testAttribute(clientMetrics, clientProps, update, "Connection", "connectionId", "Con1");
-    testAttribute(clientMetrics, clientProps, update, "Connection", "localHost", "127.0.0.1");
+    if (!inFreeBSDJail())
+    {
+      testAttribute(clientMetrics, clientProps, update, "Connection", "localHost", "127.0.0.1");
+      testAttribute(clientMetrics, clientProps, update, "Connection", "remoteHost", "127.0.0.1");
+    }
     //testAttribute(clientMetrics, clientProps, update, "Connection", "localPort", "");
-    testAttribute(clientMetrics, clientProps, update, "Connection", "remoteHost", "127.0.0.1");
     testAttribute(clientMetrics, clientProps, update, "Connection", "remotePort", "12010");
     testAttribute(clientMetrics, clientProps, update, "Connection", "mcastHost", "");
     testAttribute(clientMetrics, clientProps, update, "Connection", "mcastPort", "");
@@ -814,9 +817,12 @@
     testAttribute(serverMetrics, serverProps, update, "Dispatch", "incoming", "true", op);
     testAttribute(serverMetrics, serverProps, update, "Dispatch", "adapterName", "TestAdapter", op);
     testAttribute(serverMetrics, serverProps, update, "Dispatch", "connectionId", "", op);
-    testAttribute(serverMetrics, serverProps, update, "Dispatch", "localHost", "127.0.0.1", op);
+    if (!inFreeBSDJail())
+    {
+      testAttribute(serverMetrics, serverProps, update, "Dispatch", "localHost", "127.0.0.1", op);
+      testAttribute(serverMetrics, serverProps, update, "Dispatch", "remoteHost", "127.0.0.1", op);
+    }
     testAttribute(serverMetrics, serverProps, update, "Dispatch", "localPort", "12010", op);
-    testAttribute(serverMetrics, serverProps, update, "Dispatch", "remoteHost", "127.0.0.1", op);
     //testAttribute(serverMetrics, serverProps, update, "Dispatch", "remotePort", "12010", op);
     testAttribute(serverMetrics, serverProps, update, "Dispatch", "mcastHost", "", op);
     testAttribute(serverMetrics, serverProps, update, "Dispatch", "mcastPort", "", op);




--- cpp.orig/test/Ice/properties/run.py	2013-03-11 15:19:47.000000000 +0000
+++ cpp/test/Ice/properties/run.py	2013-05-21 03:48:13.020195761 +0000
@@ -28,15 +28,15 @@
 #
 if sys.version_info[0] == 2:
     configPath = "./config/\xe4\xb8\xad\xe5\x9b\xbd_client.config".decode("utf-8")
-    TestUtil.createConfig(configPath, 
+    TestUtil.createConfig(configPath.encode("utf-8"), 
                           ["# Automatically generated by Ice test driver.", 
                            "Ice.Trace.Protocol=1",
                            "Ice.Trace.Network=1", 
                            "Ice.ProgramName=PropertiesClient", 
-                           "Config.Path=./config/中国_client.config"])
+                           "Config.Path=" + configPath.encode("utf-8")])
 else:
     configPath = "./config/\u4e2d\u56fd_client.config"
-    TestUtil.createConfig(configPath, 
+    TestUtil.createConfig(configPath.encode("utf-8"), 
                           ["# Automatically generated by Ice test driver.", 
                            "Ice.Trace.Protocol=1",
                            "Ice.Trace.Network=1", 
@@ -46,5 +46,5 @@
 
 TestUtil.createConfig(configPath, 
                       ["# Automatically generated by Ice test driver.", 
@@ -38,4 +38,4 @@
 TestUtil.simpleTest(client)
 
-if os.path.exists(configPath):
-    os.remove(configPath)
+if os.path.exists(configPath.encode("utf-8")):
+    os.remove(configPath.encode("utf-8"))




--- cpp.orig/test/IceUtil/unicode/Client.cpp	2011-06-15 21:43:59.000000000 +0200
+++ cpp/test/IceUtil/unicode/Client.cpp	2012-03-04 20:14:53.000000000 +0100
@@ -15,6 +15,10 @@
 #   include <io.h>
 #endif
 
+#ifdef __FreeBSD__
+#   include <unistd.h>
+#endif
+
 using namespace IceUtil;
 using namespace std;
 




--- cpp.orig/test/Slice/keyword/Client.cpp	2011-06-15 21:43:59.000000000 +0200
+++ cpp/test/Slice/keyword/Client.cpp	2012-03-04 20:14:53.000000000 +0100
@@ -73,6 +73,9 @@
     virtual void ice_response(Ice::Int)  {}
     virtual void ice_exception(const ::Ice::Exception&) {}
 };
+
+template<typename T>
+void unused(T const &) { }
    
 //
 // This section of the test is present to ensure that the C++ types
@@ -86,6 +89,7 @@
 
     _cpp_and::_cpp_auto b;
     b._cpp_default = 0;
+    unused(b);
 
     _cpp_and::deletePtr c = new _cpp_and::_cpp_delete();
     c->_cpp_else = "";




--- scripts.orig/TestUtil.py	2013-03-11 15:19:47.000000000 +0000
+++ scripts/TestUtil.py	2013-05-21 00:29:37.903194948 +0000
@@ -84,6 +84,25 @@
 def isLinux():
     return sys.platform.startswith("linux")
 

 def getCppCompiler():
     compiler = ""
     if os.environ.get("CPP_COMPILER", "") != "":
@@ -1846,6 +1865,14 @@
                 print("%s*** test not supported under Darwin%s" % (prefix, suffix))
                 print "%s*** test not supported under Darwin%s" % (prefix, suffix)
                 continue
 
+            if isFreeBSD() and "nofreebsd" in config:
+                print("%s*** test not supported under FreeBSD%s" % (prefix, suffix))
+                continue
+
+            if isFreeBSDJail() and "nofreebsdjail" in config:
+                print("%s*** test not supported within a FreeBSD Jail%s" % (prefix, suffix))
+                continue
+
             if not isWin32() and "win32only" in config:
                 print("%s*** test only supported under Win32%s" % (prefix, suffix))
                 continue




The default on-the-wire encoding for Ice changed in version 3.5 and IPv6
is now enabled by default. ABI versions are not compatible.

For details on these and additional changes please read the upgrading
instructions available at

	http://doc.zeroc.com/x/SQpN

For on-the-wire background compatibility add

	Ice.IPv6=0
	Ice.Default.EncodingVersion=1.0

to your Ice application configuration.




include/Freeze/TransactionalEvictor.h
include/Glacier2/Application.h
include/Glacier2/Glacier2.h
include/Glacier2/Metrics.h
include/Glacier2/PermissionsVerifier.h
include/Glacier2/PermissionsVerifierF.h
include/Glacier2/Router.h
include/Glacier2/RouterF.h
include/Glacier2/SSLInfo.h
include/Glacier2/Session.h
include/Glacier2/SessionHelper.h
include/Ice/Application.h
include/Ice/BasicStream.h
include/Ice/Buffer.h

include/Ice/FacetMap.h
include/Ice/FactoryTable.h
include/Ice/FactoryTableInit.h
include/Ice/Format.h
include/Ice/Functional.h
include/Ice/GCCountMap.h
include/Ice/GCShared.h

include/Ice/IncomingAsyncF.h
include/Ice/Initialize.h
include/Ice/InstanceF.h
include/Ice/Instrumentation.h
include/Ice/InstrumentationF.h
include/Ice/LocalException.h
include/Ice/LocalObject.h
include/Ice/LocalObjectF.h

include/Ice/Logger.h
include/Ice/LoggerF.h
include/Ice/LoggerUtil.h
include/Ice/Metrics.h
include/Ice/MetricsAdminI.h
include/Ice/MetricsFunctional.h
include/Ice/MetricsObserverI.h
include/Ice/Object.h
include/Ice/ObjectAdapter.h
include/Ice/ObjectAdapterF.h

include/Ice/ObjectF.h
include/Ice/ObjectFactory.h
include/Ice/ObjectFactoryF.h
include/Ice/ObjectFactoryManagerF.h
include/Ice/ObserverHelper.h
include/Ice/Outgoing.h
include/Ice/OutgoingAsync.h
include/Ice/OutgoingAsyncF.h

include/Ice/Process.h
include/Ice/ProcessF.h
include/Ice/Properties.h
include/Ice/PropertiesAdmin.h
include/Ice/PropertiesF.h
include/Ice/Protocol.h
include/Ice/ProtocolPluginFacade.h

include/Ice/Service.h
include/Ice/SliceChecksumDict.h
include/Ice/SliceChecksums.h
include/Ice/SlicedData.h
include/Ice/SlicedDataF.h
include/Ice/Stats.h
include/Ice/StatsF.h
include/Ice/Stream.h
include/Ice/StreamF.h
include/Ice/StreamHelpers.h
include/Ice/StringConverter.h
include/Ice/UndefSysMacros.h
include/Ice/UserExceptionFactory.h
include/Ice/Version.h
include/IceBox/IceBox.h
include/IceGrid/Admin.h
include/IceGrid/Descriptor.h

include/IceSSL/IceSSL.h
include/IceSSL/Plugin.h
include/IceStorm/IceStorm.h
include/IceStorm/Metrics.h
include/IceUtil/AbstractMutex.h
include/IceUtil/ArgVector.h
include/IceUtil/Cache.h

include/IceUtil/MutexProtocol.h
include/IceUtil/MutexPtrLock.h
include/IceUtil/MutexPtrTryLock.h
include/IceUtil/Optional.h
include/IceUtil/Options.h
include/IceUtil/OutputUtil.h
include/IceUtil/RWRecMutex.h
include/IceUtil/Random.h
include/IceUtil/RecMutex.h
include/IceUtil/ScannerConfig.h
include/IceUtil/ScopedArray.h
include/IceUtil/Shared.h
include/IceUtil/StopWatch.h
include/IceUtil/StringUtil.h
include/IceUtil/Thread.h
include/IceUtil/ThreadException.h

include/IceUtil/Timer.h
include/IceUtil/UUID.h
include/IceUtil/Unicode.h
include/IceUtil/UniquePtr.h
include/IceXML/Parser.h
include/Slice/CPlusPlusUtil.h
include/Slice/Checksum.h

include/Slice/Util.h
lib/ImportKey.class
lib/libFreeze.so
lib/libFreeze.so.3.5.0
lib/libFreeze.so.35
lib/libGlacier2.so
lib/libGlacier2.so.3.5.0
lib/libGlacier2.so.35
lib/libIce.so
lib/libIce.so.3.5.0
lib/libIce.so.35
lib/libIceBox.so
lib/libIceBox.so.3.5.0
lib/libIceBox.so.35
lib/libIceDB.so
lib/libIceDB.so.3.5.0
lib/libIceDB.so.35
lib/libIceGrid.so
lib/libIceGrid.so.3.5.0
lib/libIceGrid.so.35
lib/libIceGridFreezeDB.so
lib/libIceGridFreezeDB.so.3.5.0
lib/libIceGridFreezeDB.so.35
lib/libIcePatch2.so
lib/libIcePatch2.so.3.5.0
lib/libIcePatch2.so.35
lib/libIceSSL.so
lib/libIceSSL.so.3.5.0
lib/libIceSSL.so.35
lib/libIceStorm.so
lib/libIceStorm.so.3.5.0
lib/libIceStorm.so.35
lib/libIceStormFreezeDB.so
lib/libIceStormFreezeDB.so.3.5.0
lib/libIceStormFreezeDB.so.35
lib/libIceStormService.so
lib/libIceStormService.so.3.5.0
lib/libIceStormService.so.35
lib/libIceUtil.so
lib/libIceUtil.so.3.5.0
lib/libIceUtil.so.35
lib/libIceXML.so
lib/libIceXML.so.3.5.0
lib/libIceXML.so.35
lib/libSlice.so
lib/libSlice.so.3.5.0
lib/libSlice.so.35
%%DATADIR%%/Freeze/BackgroundSaveEvictor.ice
%%DATADIR%%/Freeze/CatalogData.ice
%%DATADIR%%/Freeze/Connection.ice

%%DATADIR%%/Freeze/Exception.ice
%%DATADIR%%/Freeze/Transaction.ice
%%DATADIR%%/Freeze/TransactionalEvictor.ice
%%DATADIR%%/Glacier2/Metrics.ice
%%DATADIR%%/Glacier2/PermissionsVerifier.ice
%%DATADIR%%/Glacier2/PermissionsVerifierF.ice
%%DATADIR%%/Glacier2/Router.ice

%%DATADIR%%/Ice/Identity.ice
%%DATADIR%%/Ice/ImplicitContext.ice
%%DATADIR%%/Ice/ImplicitContextF.ice
%%DATADIR%%/Ice/Instrumentation.ice
%%DATADIR%%/Ice/InstrumentationF.ice
%%DATADIR%%/Ice/LocalException.ice
%%DATADIR%%/Ice/Locator.ice
%%DATADIR%%/Ice/LocatorF.ice
%%DATADIR%%/Ice/Logger.ice
%%DATADIR%%/Ice/LoggerF.ice
%%DATADIR%%/Ice/Metrics.ice
%%DATADIR%%/Ice/ObjectAdapter.ice
%%DATADIR%%/Ice/ObjectAdapterF.ice
%%DATADIR%%/Ice/ObjectFactory.ice

%%DATADIR%%/Ice/SliceChecksumDict.ice
%%DATADIR%%/Ice/Stats.ice
%%DATADIR%%/Ice/StatsF.ice
%%DATADIR%%/Ice/Version.ice
%%DATADIR%%/IceBox/IceBox.ice
%%DATADIR%%/IceGrid/Admin.ice
%%DATADIR%%/IceGrid/Descriptor.ice

%%DATADIR%%/IceSSL/ConnectionInfo.ice
%%DATADIR%%/IceSSL/EndpointInfo.ice
%%DATADIR%%/IceStorm/IceStorm.ice
%%DATADIR%%/IceStorm/Metrics.ice
%%DATADIR%%/LICENSE
%%DATADIR%%/config/convertssl.py
%%DATADIR%%/config/icegrid-slice.3.1.ice.gz
%%DATADIR%%/config/icegrid-slice.3.2.ice.gz
%%DATADIR%%/config/icegrid-slice.3.3.ice.gz
%%DATADIR%%/config/icegrid-slice.3.5.ice.gz
%%DATADIR%%/config/templates.xml
%%DATADIR%%/config/upgradeicegrid33.py
%%DATADIR%%/config/upgradeicegrid35.py
%%PORTDOCS%%%%DOCSDIR%%/reference/Freeze.html
%%PORTDOCS%%%%DOCSDIR%%/reference/Freeze/BackgroundSaveEvictor.html
%%PORTDOCS%%%%DOCSDIR%%/reference/Freeze/CatalogData.html

%%PORTDOCS%%%%DOCSDIR%%/reference/Freeze/TransactionAlreadyInProgressException.html
%%PORTDOCS%%%%DOCSDIR%%/reference/Freeze/TransactionalEvictor.html
%%PORTDOCS%%%%DOCSDIR%%/reference/Glacier2.html
%%PORTDOCS%%%%DOCSDIR%%/reference/Glacier2/Admin.html
%%PORTDOCS%%%%DOCSDIR%%/reference/Glacier2/CannotCreateSessionException.html
%%PORTDOCS%%%%DOCSDIR%%/reference/Glacier2/IdentitySet.html
%%PORTDOCS%%%%DOCSDIR%%/reference/Glacier2/PermissionDeniedException.html

%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/DNSException.html
%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/DatagramLimitException.html
%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/EncapsulationException.html
%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/EncodingVersion.html
%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/Endpoint.html
%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/EndpointInfo.html
%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/EndpointParseException.html

%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/IllegalMessageSizeException.html
%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/ImplicitContext.html
%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/InitializationException.html
%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/Instrumentation.html
%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/InvalidReplicaGroupIdException.html
%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/Locator.html
%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/LocatorRegistry.html

%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/Properties.html
%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/PropertiesAdmin.html
%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/ProtocolException.html
%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/ProtocolVersion.html
%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/ProxyParseException.html
%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/ProxyUnmarshalException.html
%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/RequestFailedException.html

%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/UnsupportedEncodingException.html
%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/UnsupportedProtocolException.html
%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/VersionMismatchException.html
%%PORTDOCS%%%%DOCSDIR%%/reference/Ice/VersionParseException.html
%%PORTDOCS%%%%DOCSDIR%%/reference/IceBox.html
%%PORTDOCS%%%%DOCSDIR%%/reference/IceBox/AlreadyStartedException.html
%%PORTDOCS%%%%DOCSDIR%%/reference/IceBox/AlreadyStoppedException.html

%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/TemplateDescriptor.html
%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/UserAccountMapper.html
%%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid/UserAccountNotFoundException.html
%%PORTDOCS%%%%DOCSDIR%%/reference/IceMX.html
%%PORTDOCS%%%%DOCSDIR%%/reference/IceMX/ConnectionMetrics.html
%%PORTDOCS%%%%DOCSDIR%%/reference/IceMX/DispatchMetrics.html
%%PORTDOCS%%%%DOCSDIR%%/reference/IceMX/InvocationMetrics.html
%%PORTDOCS%%%%DOCSDIR%%/reference/IceMX/Metrics.html
%%PORTDOCS%%%%DOCSDIR%%/reference/IceMX/MetricsAdmin.html
%%PORTDOCS%%%%DOCSDIR%%/reference/IceMX/MetricsFailures.html
%%PORTDOCS%%%%DOCSDIR%%/reference/IceMX/RemoteMetrics.html
%%PORTDOCS%%%%DOCSDIR%%/reference/IceMX/SessionMetrics.html
%%PORTDOCS%%%%DOCSDIR%%/reference/IceMX/SubscriberMetrics.html
%%PORTDOCS%%%%DOCSDIR%%/reference/IceMX/ThreadMetrics.html
%%PORTDOCS%%%%DOCSDIR%%/reference/IceMX/TopicMetrics.html
%%PORTDOCS%%%%DOCSDIR%%/reference/IceMX/UnknownMetricsView.html
%%PORTDOCS%%%%DOCSDIR%%/reference/IcePatch2.html
%%PORTDOCS%%%%DOCSDIR%%/reference/IcePatch2/Admin.html
%%PORTDOCS%%%%DOCSDIR%%/reference/IcePatch2/FileAccessException.html
%%PORTDOCS%%%%DOCSDIR%%/reference/IcePatch2/FileInfo.html
%%PORTDOCS%%%%DOCSDIR%%/reference/IcePatch2/FileServer.html

%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/IceStorm
%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/IceSSL
%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/IcePatch2
%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/IceMX
%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/IceGrid
%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/IceBox
%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/Ice

Return to bug 179233

Lines 2-15 Link Here

(-)./Makefile (-5 / +6 lines)
2	# $FreeBSD: devel/ice/Makefile 316654 2013-04-27 08:50:46Z mva $	2	# $FreeBSD: devel/ice/Makefile 316654 2013-04-27 08:50:46Z mva $
3		3
4	PORTNAME= Ice	4	PORTNAME= Ice
5	PORTVERSION= 3.4.2	5	PORTVERSION= 3.5.0
6	PORTREVISION= 3
7	CATEGORIES= devel	6	CATEGORIES= devel
8	MASTER_SITES= http://download.zeroc.com/Ice/3.4/	7	MASTER_SITES= http://download.zeroc.com/Ice/3.5/
9		8
10	MAINTAINER= freebsd@grem.de	9	MAINTAINER= freebsd@grem.de
11	COMMENT= Modern alternative to object middleware such as CORBA/COM/DCOM/COM+	10	COMMENT= Modern alternative to object middleware such as CORBA/COM/DCOM/COM+
12		11
		12	LICENSE= GPLv2
		13
13	LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2 \	14	LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2 \
14	mcpp:${PORTSDIR}/devel/mcpp	15	mcpp:${PORTSDIR}/devel/mcpp
15		16
Lines 26-33 Link Here
26		27
27	USE_GMAKE= yes	28	USE_GMAKE= yes
28	USES= iconv	29	USES= iconv
29	USE_BDB= 42+	30	USE_BDB= 5
30	INVALID_BDB_VER= 2 3 40 41	31	INVALID_BDB_VER= 2 3 40 41 42 43 44 46 47 48
31	USE_LDCONFIG= yes	32	USE_LDCONFIG= yes
32	BUILD_WRKSRC= ${WRKSRC}/cpp	33	BUILD_WRKSRC= ${WRKSRC}/cpp
33	INSTALL_WRKSRC= ${WRKSRC}/cpp	34	INSTALL_WRKSRC= ${WRKSRC}/cpp

Lines 1-12 Link Here

(-)./files/patch-Make.rules (-12 lines)
1	--- cpp/config/Make.rules.orig Fri Mar 9 00:16:54 2007
2	+++ cpp/config/Make.rules Fri Apr 13 20:05:04 2007
3	@@ -188,7 +188,9 @@
4	DB_FLAGS = -I/usr/include/db45
5	DB_LIBS = -L/usr/$(libsubdir)/db45 -ldb_cxx
6	else
7	- DB_LIBS = -ldb_cxx
8	+ DB_FLAGS = -I%%BDB_INCLUDE_DIR%%
9	+ DB_LIBS = -L%%BDB_LIB_DIR%% -l%%BDB_LIB_CXX_NAME%%
10	+ DB_RPATH_LINK = $(call rpathlink,%%BDB_LIB_DIR%%)
11	endif
12	endif

Lines 1-26 Link Here

(-)./files/patch-Makefile (-26 lines)
1	--- cpp.orig/Makefile 2012-03-04 21:38:42.000000000 +0100
2	+++ cpp/Makefile 2012-03-04 21:38:42.000000000 +0100
3	@@ -11,7 +11,22 @@
4
5	include $(top_srcdir)/config/Make.rules
6
7	-SUBDIRS = config src include test demo
8	+SUBDIRS = config src include
9	+
10	+ifeq ($(NOTESTS),)
11	+SUBDIRS += test
12	+endif
13	+
14	+ifeq ($(NODEMOS),)
15	+SUBDIRS += demo
16	+endif
17	+
18	+ifeq ($(NOPORTDOCS),)
19	+SUBDIRS += doc
20	+endif
21	+
22	+ INSTALL_SUBDIRS = $(install_bindir) $(install_libdir) $(install_includedir) $(install_configdir)
23	+
24
25	INSTALL_SUBDIRS = $(install_bindir) $(install_libdir) $(install_includedir) $(install_configdir)
26

Line 0 Link Here

(-)./files/patch-config-Make.common.rules (+18 lines)
	1	--- config.orig/Make.common.rules 2013-05-20 22:21:58.666286011 +0000
	2	+++ config/Make.common.rules 2013-05-20 22:20:50.897196090 +0000
	3	@@ -378,11 +378,15 @@
	4	then \
	5	echo "Creating $(install_slicedir)..." ; \
	6	$(call mkdir, $(install_slicedir)) ; \
	7	+ fi
	8	+
	9	+ @if test -d $(install_slicedir) ; \
	10	+ then \
	11	cd $(top_srcdir)/../slice ; \
	12	for subdir in * ; \
	13	do \
	14	echo "Copying slice/$$subdir to $(install_slicedir)..." ; \
	15	cp -fpr $$subdir $(install_slicedir) ; \
	16	done ; \
	17	- fi
	18	+ fi

Line 0 Link Here

(-)./files/patch-cpp-Makefile (+26 lines)
	1	--- cpp.orig/Makefile 2013-03-11 15:19:46.000000000 +0000
	2	+++ cpp/Makefile 2013-05-19 22:06:57.713280491 +0000
	3	@@ -11,11 +11,22 @@
	4
	5	include $(top_srcdir)/config/Make.rules
	6
	7	-SUBDIRS = config src include test
	8	+SUBDIRS = config src include
	9	+
	10	+ifeq ($(NOTESTS),)
	11	+SUBDIRS := $(SUBDIRS) test
	12	+endif
	13
	14	ifeq ($(shell uname \| grep MINGW),)
	15	+ifeq ($(NODEMOS),)
	16	SUBDIRS := $(SUBDIRS) demo
	17	endif
	18	+endif
	19	+
	20	+ifeq ($(NOPORTDOCS),)
	21	+SUBDIRS := $(SUBDIRS) doc
	22	+endif
	23	+
	24
	25	INSTALL_SUBDIRS = $(install_bindir) $(install_libdir) $(install_includedir) $(install_configdir)
	26

Lines 1-13 Link Here

(-)./files/patch-cpp-allTests.py (-12 / +4 lines)
1	--- cpp.orig/allTests.py 2011-06-15 21:43:58.000000000 +0200	1	--- cpp.orig/allTests.py 2013-03-11 15:19:58.000000000 +0000
2	+++ cpp/allTests.py 2012-03-04 20:14:52.000000000 +0100	2	+++ cpp/allTests.py 2013-05-19 22:25:00.000000000 +0000
3	@@ -25,6 +25,7 @@
4	# List of all basic tests.
5	#
6	tests = [
7	+
8	("IceUtil/condvar", ["once", "win32only"]),
9	("IceUtil/thread", ["once"]),
10	("IceUtil/unicode", ["once"]),
11	@@ -62,7 +63,7 @@	3	@@ -62,7 +63,7 @@
12	("Ice/servantLocator", ["core"]),	4	("Ice/servantLocator", ["core"]),
13	("Ice/interceptor", ["core"]),	5	("Ice/interceptor", ["core"]),
Lines 22-30 Link Here
22	if TestUtil.isWin32() or os.getuid() == 0:	14	if TestUtil.isWin32() or os.getuid() == 0:
23	tests += [	15	tests += [
24	- ("IceUtil/priority", ["core", "nodarwin"]),	16	- ("IceUtil/priority", ["core", "nodarwin"]),
25	- ("Ice/threadPoolPriority", ["core", "nodarwin"])	17	- ("Ice/threadPoolPriority", ["core", "nodarwin", "nomx"])
26	+ ("IceUtil/priority", ["core", "nodarwin", "nofreebsd"]),	18	+ ("IceUtil/priority", ["core", "nodarwin", "nofreebsd"]),
27	+ ("Ice/threadPoolPriority", ["core", "nodarwin", "nofreebsd"])	19	+ ("Ice/threadPoolPriority", ["core", "nodarwin", "nofreebsd", "nomx"])
28	]	20	]
29		21
30	if __name__ == "__main__":	22	if __name__ == "__main__":

Line 0 Link Here

(-)./files/patch-cpp-config-Make.rules (+13 lines)
	1	--- cpp.orig/config/Make.rules Fri Mar 11 16:19:00 2013
	2	+++ cpp/config/Make.rules Fri May 19 22:00:09 2013
	3	@@ -233,7 +233,9 @@
	4	DB_FLAGS = -I/usr/local/include/db53
	5	DB_LIBS = -L/usr/local/$(libsubdir)/db53 -ldb_cxx
	6	else
	7	- DB_LIBS = -ldb_cxx
	8	+ DB_FLAGS = -I%%BDB_INCLUDE_DIR%%
	9	+ DB_LIBS = -L%%BDB_LIB_DIR%% -l%%BDB_LIB_CXX_NAME%%
	10	+ DB_RPATH_LINK = $(call rpathlink,%%BDB_LIB_DIR%%)
	11	endif
	12	endif
	13	endif

Lines 1-15 Link Here

(-)./files/patch-cpp-demo-IceGrid-secure-README (-15 lines)
1	--- cpp.orig/demo/IceGrid/secure/README 2011-06-15 21:44:00.000000000 +0200
2	+++ cpp/demo/IceGrid/secure/README 2012-03-04 19:55:44.000000000 +0100
3	@@ -31,9 +31,10 @@
4	the filesystem permissions to restrict access to the certificate.
5
6	Once the certificates are generated, you can start the IceGrid
7	-registry, node, and Glacier2 router:
8	+registries, node, and Glacier2 router:
9
10	-$ icegridregistry --Ice.Config=config.registry
11	+$ icegridregistry --Ice.Config=config.master
12	+$ icegridregistry --Ice.Config=config.slave
13	$ icegridnode --Ice.Config=config.node
14	$ glacier2router --Ice.Config=config.glacier2
15

Lines 1-13 Link Here

(-)./files/patch-cpp-demo-IceGrid-secure-application.xml (-13 lines)
1	--- cpp.orig/demo/IceGrid/secure/application.xml 2011-06-15 21:43:58.000000000 +0200
2	+++ cpp/demo/IceGrid/secure/application.xml 2012-03-04 19:55:44.000000000 +0100
3	@@ -20,8 +20,8 @@
4	<property name="IceSSL.DefaultDir" value="certs"/>
5
6	<property name="Ice.Admin.Endpoints" value="ssl -h 127.0.0.1"/>
7	- <property name="IceSSL.TrustOnly.Client" value="CN=IceGrid Registry"/>
8	- <property name="IceSSL.TrustOnly.Server.Ice.Admin" value="CN=IceGrid Node"/>
9	+ <property name="IceSSL.TrustOnly.Client" value="CN=Master;CN=Slave"/>
10	+ <property name="IceSSL.TrustOnly.Server.Ice.Admin" value="CN=Node"/>
11	</properties>
12
13	<node name="Node">

Lines 1-64 Link Here

(-)./files/patch-cpp-demo-IceGrid-secure-config.master (-64 lines)
1	--- cpp.orig/demo/IceGrid/secure/config.master 2012-03-04 19:55:44.000000000 +0100
2	+++ cpp/demo/IceGrid/secure/config.master 2012-03-04 19:55:44.000000000 +0100
3	@@ -0,0 +1,61 @@
4	+#
5	+# The IceGrid instance name.
6	+#
7	+IceGrid.InstanceName=DemoIceGrid
8	+
9	+#
10	+# IceGrid registry configuration.
11	+#
12	+IceGrid.Registry.Client.Endpoints=tcp -p 4061 -t 10000:ssl -p 4062 -t 10000
13	+IceGrid.Registry.Server.Endpoints=ssl -t 10000
14	+IceGrid.Registry.Internal.Endpoints=ssl -t 10000
15	+IceGrid.Registry.Data=db/master
16	+
17	+#
18	+# Ensure that nodes and slaves connecting to this registry have a name
19	+# matching the certificate CN.
20	+#
21	+IceGrid.Registry.RequireNodeCertCN=1
22	+IceGrid.Registry.RequireReplicaCertCN=1
23	+
24	+#
25	+# IceGrid admin clients must use a secure connection to connect to the
26	+# registry or use Glacier2.
27	+#
28	+IceGrid.Registry.AdminSessionManager.Endpoints=ssl -t 10000
29	+IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
30	+
31	+#
32	+# IceGrid SQL configuration if using SQL database.
33	+#
34	+#Ice.Plugin.DB=IceGridSqlDB:createSqlDB
35	+#IceGrid.SQL.DatabaseType=QSQLITE
36	+#IceGrid.SQL.DatabaseName=db/master/Registry.db
37	+
38	+#
39	+# Trace properties.
40	+#
41	+Ice.ProgramName=Master
42	+IceGrid.Registry.Trace.Node=2
43	+IceGrid.Registry.Trace.Replica=2
44	+
45	+#
46	+# SSL Configuration
47	+#
48	+Ice.Plugin.IceSSL=IceSSL:createIceSSL
49	+IceSSL.DefaultDir=certs
50	+IceSSL.CertAuthFile=ca_cert.pem
51	+IceSSL.CertFile=master_cert.pem
52	+IceSSL.KeyFile=master_key.pem
53	+
54	+#
55	+# Don't require certificates. This is useful for admin clients that don't
56	+# use certificate but still need to establish a secure connection for the
57	+# username/password authentication
58	+#
59	+IceSSL.VerifyPeer=1
60	+
61	+IceSSL.TrustOnly.Client=CN="Master";CN="Slave";CN="Node";CN="Glacier2"
62	+IceSSL.TrustOnly.Server.IceGrid.Registry.Server=CN="Server"
63	+IceSSL.TrustOnly.Server.IceGrid.Registry.Internal=CN="Node";CN="Master";CN="Slave"
64	+IceSSL.TrustOnly.Server.IceGrid.Registry.AdminSessionManager=CN="Glacier2"

Lines 1-19 Link Here

(-)./files/patch-cpp-demo-IceGrid-secure-config.node (-19 lines)
1	--- cpp.orig/demo/IceGrid/secure/config.node 2011-06-15 21:43:58.000000000 +0200
2	+++ cpp/demo/IceGrid/secure/config.node 2012-03-04 19:55:44.000000000 +0100
3	@@ -1,7 +1,7 @@
4	#
5	# The IceGrid locator proxy.
6	#
7	-Ice.Default.Locator=DemoIceGrid/Locator:ssl -p 4062 -t 10000
8	+Ice.Default.Locator=DemoIceGrid/Locator:ssl -p 4062 -t 10000:ssl -p 14062 -t 10000
9
10	#
11	# IceGrid node configuration.
12	@@ -26,5 +26,5 @@
13	IceSSL.CertFile=node_cert.pem
14	IceSSL.KeyFile=node_key.pem
15
16	-IceSSL.TrustOnly.Client=CN="Server";CN="IceGrid Registry"
17	-IceSSL.TrustOnly.Server=CN="IceGrid Registry"
18	+IceSSL.TrustOnly.Client=CN="Server";CN="Master";CN="Slave"
19	+IceSSL.TrustOnly.Server=CN="Master";CN="Slave"

Lines 1-57 Link Here

(-)./files/patch-cpp-demo-IceGrid-secure-config.registry (-57 lines)
1	--- cpp.orig/demo/IceGrid/secure/config.registry 2011-06-15 21:43:58.000000000 +0200
2	+++ cpp/demo/IceGrid/secure/config.registry 2012-03-04 19:55:44.000000000 +0100
3	@@ -1,54 +0,0 @@
4	-#
5	-# The IceGrid instance name.
6	-#
7	-IceGrid.InstanceName=DemoIceGrid
8	-
9	-#
10	-# IceGrid registry configuration.
11	-#
12	-IceGrid.Registry.Client.Endpoints=tcp -p 4061 -t 10000:ssl -p 4062 -t 10000
13	-IceGrid.Registry.Server.Endpoints=ssl -t 10000
14	-IceGrid.Registry.Internal.Endpoints=ssl -t 10000
15	-IceGrid.Registry.Data=db/registry
16	-
17	-#
18	-# IceGrid admin clients must use a secure connection to connect to the
19	-# registry or use Glacier2.
20	-#
21	-IceGrid.Registry.AdminSessionManager.Endpoints=ssl -t 10000
22	-IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
23	-
24	-#
25	-# IceGrid SQL configuration if using SQL database.
26	-#
27	-#Ice.Plugin.DB=IceGridSqlDB:createSqlDB
28	-#IceGrid.SQL.DatabaseType=QSQLITE
29	-#IceGrid.SQL.DatabaseName=db/registry/Registry.db
30	-
31	-#
32	-# Trace properties.
33	-#
34	-Ice.ProgramName=Registry
35	-IceGrid.Registry.Trace.Node=2
36	-IceGrid.Registry.Trace.Replica=2
37	-
38	-#
39	-# SSL Configuration
40	-#
41	-Ice.Plugin.IceSSL=IceSSL:createIceSSL
42	-IceSSL.DefaultDir=certs
43	-IceSSL.CertAuthFile=ca_cert.pem
44	-IceSSL.CertFile=registry_cert.pem
45	-IceSSL.KeyFile=registry_key.pem
46	-
47	-#
48	-# Don't require certificates. This is useful for admin clients that don't
49	-# use certificate but still need to establish a secure connection for the
50	-# username/password authentication
51	-#
52	-IceSSL.VerifyPeer=1
53	-
54	-IceSSL.TrustOnly.Client=CN="IceGrid Registry";CN="IceGrid Node";CN="Glacier2"
55	-IceSSL.TrustOnly.Server.IceGrid.Registry.Server=CN="Server"
56	-IceSSL.TrustOnly.Server.IceGrid.Registry.Internal=CN="IceGrid Node";CN="IceGrid Registry"
57	-IceSSL.TrustOnly.Server.IceGrid.Registry.AdminSessionManager=CN="Glacier2"

Lines 1-69 Link Here

(-)./files/patch-cpp-demo-IceGrid-secure-config.slave (-69 lines)
1	--- cpp.orig/demo/IceGrid/secure/config.slave 2012-03-04 19:55:44.000000000 +0100
2	+++ cpp/demo/IceGrid/secure/config.slave 2012-03-04 19:55:44.000000000 +0100
3	@@ -0,0 +1,66 @@
4	+#
5	+# The IceGrid locator proxy.
6	+#
7	+Ice.Default.Locator=DemoIceGrid/Locator:ssl -p 4062 -t 10000
8	+
9	+#
10	+# The IceGrid instance name.
11	+#
12	+IceGrid.InstanceName=DemoIceGrid
13	+
14	+#
15	+# IceGrid registry configuration.
16	+#
17	+IceGrid.Registry.Client.Endpoints=tcp -p 14061 -t 10000:ssl -p 14062 -t 10000
18	+IceGrid.Registry.Server.Endpoints=ssl -t 10000
19	+IceGrid.Registry.Internal.Endpoints=ssl -t 10000
20	+IceGrid.Registry.Data=db/slave
21	+IceGrid.Registry.ReplicaName=Slave
22	+
23	+#
24	+# Ensure that nodes connecting to this registry have a name matching
25	+# the certificate CN.
26	+#
27	+IceGrid.Registry.RequireNodeCertCN=1
28	+
29	+#
30	+# IceGrid admin clients must use a secure connection to connect to the
31	+# registry or use Glacier2.
32	+#
33	+IceGrid.Registry.AdminSessionManager.Endpoints=ssl -t 10000
34	+IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
35	+
36	+#
37	+# IceGrid SQL configuration if using SQL database.
38	+#
39	+#Ice.Plugin.DB=IceGridSqlDB:createSqlDB
40	+#IceGrid.SQL.DatabaseType=QSQLITE
41	+#IceGrid.SQL.DatabaseName=db/slave/Registry.db
42	+
43	+#
44	+# Trace properties.
45	+#
46	+Ice.ProgramName=Slave
47	+IceGrid.Registry.Trace.Node=2
48	+IceGrid.Registry.Trace.Replica=2
49	+
50	+#
51	+# SSL Configuration
52	+#
53	+Ice.Plugin.IceSSL=IceSSL:createIceSSL
54	+IceSSL.DefaultDir=certs
55	+IceSSL.CertAuthFile=ca_cert.pem
56	+IceSSL.CertFile=slave_cert.pem
57	+IceSSL.KeyFile=slave_key.pem
58	+
59	+#
60	+# Don't require certificates. This is useful for admin clients that don't
61	+# use certificate but still need to establish a secure connection for the
62	+# username/password authentication
63	+#
64	+IceSSL.VerifyPeer=1
65	+
66	+IceSSL.TrustOnly.Client=CN="Master";CN="Slave";CN="Node";CN="Glacier2"
67	+IceSSL.TrustOnly.Server.IceGrid.Registry.Server=CN="Server"
68	+IceSSL.TrustOnly.Server.IceGrid.Registry.Internal=CN="Node";CN="Master";CN="Slave"
69	+IceSSL.TrustOnly.Server.IceGrid.Registry.AdminSessionManager=CN="Glacier2"

Lines 1-14 Link Here

(-)./files/patch-cpp-demo-IceGrid-secure-makecerts.py (-14 lines)
1	--- cpp.orig/demo/IceGrid/secure/makecerts.py 2011-06-15 21:43:58.000000000 +0200
2	+++ cpp/demo/IceGrid/secure/makecerts.py 2012-03-04 19:55:44.000000000 +0100
3	@@ -44,8 +44,9 @@
4	print
5	print
6
7	-createCertificate("registry", "IceGrid Registry")
8	-createCertificate("node", "IceGrid Node")
9	+createCertificate("master", "Master")
10	+createCertificate("slave", "Slave")
11	+createCertificate("node", "Node")
12	createCertificate("glacier2", "Glacier2")
13	createCertificate("server", "Server")
14

Lines 1-17 Link Here

(-)./files/patch-cpp-include-Ice-ConnectionIF.h (-17 lines)
1	--- cpp.orig/include/Ice/ConnectionIF.h 2011-06-15 21:43:58.000000000 +0200
2	+++ cpp/include/Ice/ConnectionIF.h 2012-03-04 20:14:52.000000000 +0100
3	@@ -17,13 +17,13 @@
4	{
5
6	class ConnectionI;
7	+ICE_API Ice::LocalObject* upCast(Ice::ConnectionI*);
8
9	}
10
11	namespace IceInternal
12	{
13
14	-ICE_API Ice::LocalObject* upCast(Ice::ConnectionI*);
15
16	enum AsyncStatus
17	{

Lines 1-21 Link Here

(-)./files/patch-cpp-include-Ice-IconvStringConverter.h (-21 lines)
1	--- cpp.orig/include/Ice/IconvStringConverter.h 2011-06-15 21:43:58.000000000 +0200
2	+++ cpp/include/Ice/IconvStringConverter.h 2012-03-04 20:14:52.000000000 +0100
3	@@ -225,10 +225,16 @@
4	template<typename charT> /static/ void
5	IconvStringConverter<charT>::close(std::pair<iconv_t, iconv_t> cdp)
6	{
7	- int rs = iconv_close(cdp.first);
8	+#ifndef NDEBUG
9	+ int rs =
10	+#endif
11	+ iconv_close(cdp.first);
12	assert(rs == 0);
13
14	- rs = iconv_close(cdp.second);
15	+#ifndef NDEBUG
16	+ rs =
17	+#endif
18	+ iconv_close(cdp.second);
19	assert(rs == 0);
20	}
21

Lines 1-15 Link Here

(-)./files/patch-cpp-include-Ice-IncomingAsyncF.h (-15 lines)
1	--- cpp.orig/include/Ice/IncomingAsyncF.h 2011-06-15 21:43:58.000000000 +0200
2	+++ cpp/include/Ice/IncomingAsyncF.h 2012-03-04 20:14:52.000000000 +0100
3	@@ -28,12 +28,6 @@
4
5	class AMD_Object_ice_invoke;
6	class AMD_Array_Object_ice_invoke;
7	-
8	-}
9	-
10	-namespace IceInternal
11	-{
12	-
13	ICE_API IceUtil::Shared* upCast(::Ice::AMD_Object_ice_invoke*);
14	ICE_API IceUtil::Shared* upCast(::Ice::AMD_Array_Object_ice_invoke*);
15

Lines 1-15 Link Here

(-)./files/patch-cpp-include-Ice-LocalObjectF.h (-15 lines)
1	--- cpp.orig/include/Ice/LocalObjectF.h 2011-06-15 21:43:58.000000000 +0200
2	+++ cpp/include/Ice/LocalObjectF.h 2012-03-04 20:14:52.000000000 +0100
3	@@ -18,12 +18,6 @@
4	{
5
6	class LocalObject;
7	-
8	-}
9	-
10	-namespace IceInternal
11	-{
12	-
13	ICE_API IceUtil::Shared* upCast(::Ice::LocalObject*);
14
15	}

Lines 1-22 Link Here

(-)./files/patch-cpp-include-Ice-ObjectF.h (-22 lines)
1	--- cpp.orig/include/Ice/ObjectF.h 2011-06-15 21:43:58.000000000 +0200
2	+++ cpp/include/Ice/ObjectF.h 2012-03-04 20:14:52.000000000 +0100
3	@@ -17,19 +17,8 @@
4	{
5
6	class Object;
7	-
8	-}
9	-
10	-namespace IceInternal
11	-{
12	-
13	ICE_API IceUtil::Shared* upCast(::Ice::Object*);
14
15	-}
16	-
17	-namespace Ice
18	-{
19	-
20	typedef IceInternal::Handle< Object > ObjectPtr;
21
22	void ICE_API __patch__ObjectPtr(void*, ObjectPtr&);

Lines 1-17 Link Here

(-)./files/patch-cpp-include-Ice-OutgoingAsyncF.h (-17 lines)
1	--- cpp.orig/include/Ice/OutgoingAsyncF.h 2011-06-15 21:43:58.000000000 +0200
2	+++ cpp/include/Ice/OutgoingAsyncF.h 2012-03-04 20:14:52.000000000 +0100
3	@@ -19,13 +19,13 @@
4
5	class AsyncResult;
6	typedef IceInternal::Handle<AsyncResult> AsyncResultPtr;
7	+ICE_API IceUtil::Shared* upCast(::Ice::AsyncResult*);
8
9	}
10
11	namespace IceInternal
12	{
13
14	-ICE_API IceUtil::Shared* upCast(::Ice::AsyncResult*);
15
16	class OutgoingAsync;
17	ICE_API IceUtil::Shared* upCast(OutgoingAsync*);

Lines 1-56 Link Here

(-)./files/patch-cpp-include-Ice-Proxy.h (-56 lines)
1	--- cpp.orig/include/Ice/Proxy.h 2011-06-15 21:43:58.000000000 +0200
2	+++ cpp/include/Ice/Proxy.h 2012-03-04 20:14:52.000000000 +0100
3	@@ -38,6 +38,8 @@
4
5	class Locator;
6	class Router;
7	+ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::Locator*);
8	+ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::Router*);
9
10	}
11
12	@@ -46,8 +48,6 @@
13	namespace IceInternal
14	{
15
16	-ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::Locator*);
17	-ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::Router*);
18
19	class LocalExceptionWrapper;
20
21	@@ -1172,7 +1172,7 @@
22
23	TwowayCallbackNC(const TPtr& instance, bool cb, Exception excb, Sent sentcb) : CallbackNC<T>(instance, excb, sentcb)
24	{
25	- checkCallback(instance, cb \|\| excb != 0);
26	+ this->checkCallback(instance, cb \|\| excb != 0);
27	}
28	};
29
30	@@ -1188,7 +1188,7 @@
31
32	TwowayCallback(const TPtr& instance, bool cb, Exception excb, Sent sentcb) : Callback<T, CT>(instance, excb, sentcb)
33	{
34	- checkCallback(instance, cb \|\| excb != 0);
35	+ this->checkCallback(instance, cb \|\| excb != 0);
36	}
37	};
38
39	@@ -1209,7 +1209,7 @@
40	OnewayCallbackNC(const TPtr& instance, Response cb, Exception excb, Sent sentcb) :
41	CallbackNC<T>(instance, excb, sentcb), response(cb)
42	{
43	- checkCallback(instance, cb != 0 \|\| excb != 0);
44	+ this->checkCallback(instance, cb != 0 \|\| excb != 0);
45	}
46
47	virtual void __completed(const ::Ice::AsyncResultPtr& result) const
48	@@ -1254,7 +1254,7 @@
49	OnewayCallback(const TPtr& instance, Response cb, Exception excb, Sent sentcb) :
50	Callback<T, CT>(instance, excb, sentcb), response(cb)
51	{
52	- checkCallback(instance, cb != 0 \|\| excb != 0);
53	+ this->checkCallback(instance, cb != 0 \|\| excb != 0);
54	}
55
56	virtual void __completed(const ::Ice::AsyncResultPtr& result) const

Lines 1-76 Link Here

(-)./files/patch-cpp-include-Ice-ProxyF.h (-76 lines)
1	--- cpp.orig/include/Ice/ProxyF.h 2011-06-15 21:43:58.000000000 +0200
2	+++ cpp/include/Ice/ProxyF.h 2012-03-04 20:14:52.000000000 +0100
3	@@ -22,6 +22,11 @@
4	{
5
6	class Object;
7	+inline ::IceProxy::Ice::Object*
8	+upCast(::IceProxy::Ice::Object* o)
9	+{
10	+ return o;
11	+}
12
13	}
14
15	@@ -34,6 +39,11 @@
16	{
17
18	class Object;
19	+inline ::IceDelegate::Ice::Object*
20	+upCast(::IceDelegate::Ice::Object* o)
21	+{
22	+ return o;
23	+}
24
25	}
26
27	@@ -47,6 +57,12 @@
28
29	class Object;
30
31	+inline ::IceDelegateM::Ice::Object*
32	+upCast(::IceDelegateM::Ice::Object* o)
33	+{
34	+ return o;
35	+}
36	+
37	}
38
39	}
40	@@ -58,36 +74,12 @@
41	{
42
43	class Object;
44	-
45	-}
46	-
47	-}
48	-
49	-namespace IceInternal
50	-{
51	-
52	-inline ::IceProxy::Ice::Object*
53	-upCast(::IceProxy::Ice::Object* o)
54	-{
55	- return o;
56	-}
57	-
58	-inline ::IceDelegate::Ice::Object*
59	-upCast(::IceDelegate::Ice::Object* o)
60	-{
61	- return o;
62	-}
63	-
64	inline ::IceDelegateD::Ice::Object*
65	upCast(::IceDelegateD::Ice::Object* o)
66	{
67	return o;
68	}
69
70	-inline ::IceDelegateM::Ice::Object*
71	-upCast(::IceDelegateM::Ice::Object* o)
72	-{
73	- return o;
74	}
75
76	}

Lines 1-90 Link Here

(-)./files/patch-cpp-include-Ice-Stream.h (-90 lines)
1	--- cpp.orig/include/Ice/Stream.h 2011-06-15 21:43:58.000000000 +0200
2	+++ cpp/include/Ice/Stream.h 2012-03-04 20:14:52.000000000 +0100
3	@@ -17,6 +17,12 @@
4	#include <Ice/Proxy.h>
5	#include <IceUtil/Shared.h>
6
7	+namespace IceInternal
8	+{
9	+ // Forward declaration required for writer specializations.
10	+ void delegateThrowMarshalException(const char*, int, const ::std::string&);
11	+}
12	+
13	namespace Ice
14	{
15
16	@@ -45,9 +51,6 @@
17	StreamTraitTypeUnknown
18	};
19
20	-// Forward declaration required for writer specializations.
21	-class MarshalException;
22	-
23	//
24	// Base trait template. This doesn't actually do anything -- we just
25	// use it as a template that we can specialize.
26	@@ -542,7 +545,7 @@
27	{
28	if(static_cast<int>(v) < 0 \|\| static_cast<int>(v) >= StreamTrait<T>::enumLimit)
29	{
30	- throw MarshalException(__FILE__, __LINE__, "enumerator out of range");
31	+ IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range");
32	}
33	outS->write(static_cast<Byte>(v));
34	}
35	@@ -558,7 +561,7 @@
36	inS->read(val);
37	if(val > StreamTrait<T>::enumLimit)
38	{
39	- throw MarshalException(__FILE__, __LINE__, "enumerator out of range");
40	+ IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range");
41	}
42	v = static_cast<T>(val);
43	}
44	@@ -573,7 +576,7 @@
45	{
46	if(static_cast<int>(v) < 0 \|\| static_cast<int>(v) >= StreamTrait<T>::enumLimit)
47	{
48	- throw MarshalException(__FILE__, __LINE__, "enumerator out of range");
49	+ IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range");
50	}
51	outS->write(static_cast<Short>(v));
52	}
53	@@ -589,7 +592,7 @@
54	inS->read(val);
55	if(val < 0 \|\| val > StreamTrait<T>::enumLimit)
56	{
57	- throw MarshalException(__FILE__, __LINE__, "enumerator out of range");
58	+ IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range");
59	}
60	v = static_cast<T>(val);
61	}
62	@@ -603,7 +606,7 @@
63	{
64	if(static_cast<int>(v) < 0 \|\| static_cast<int>(v) >= StreamTrait<T>::enumLimit)
65	{
66	- throw MarshalException(__FILE__, __LINE__, "enumerator out of range");
67	+ IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range");
68	}
69	outS->write(static_cast<Int>(v));
70	}
71	@@ -619,7 +622,7 @@
72	inS->read(val);
73	if(val < 0 \|\| val > StreamTrait<T>::enumLimit)
74	{
75	- throw MarshalException(__FILE__, __LINE__, "enumerator out of range");
76	+ IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range");
77	}
78	v = static_cast<T>(val);
79	}
80	--- cpp.orig/include/Ice/Stream.h 2011-06-15 21:43:58.000000000 +0200
81	+++ cpp/include/Ice/Stream.h 2012-09-10 11:43:58.000000000 +0200
82	@@ -664,7 +664,7 @@ struct StreamWriter<StreamTraitTypeSequenceBool>
83	outS->writeSize(static_cast<Int>(v.size()));
84	for(typename T::const_iterator p = v.begin(); p != v.end(); ++p)
85	{
86	- outS->write(*p);
87	+ outS->write(static_cast<bool>(*p));
88	}
89	}
90	};

Lines 1-15 Link Here

(-)./files/patch-cpp-include-Ice-StreamF.h (-15 lines)
1	--- cpp.orig/include/Ice/StreamF.h 2011-06-15 21:43:58.000000000 +0200
2	+++ cpp/include/Ice/StreamF.h 2012-03-04 20:14:52.000000000 +0100
3	@@ -19,12 +19,6 @@
4
5	class InputStream;
6	class OutputStream;
7	-
8	-}
9	-
10	-namespace IceInternal
11	-{
12	-
13	ICE_API IceUtil::Shared* upCast(::Ice::InputStream*);
14	ICE_API IceUtil::Shared* upCast(::Ice::OutputStream*);
15

Lines 1-19 Link Here

(-)./files/patch-cpp-include-IceUtil-Config.h (-18 / +10 lines)
1	--- cpp.orig/include/IceUtil/Config.h 2011-06-15 21:43:58.000000000 +0200	1	--- cpp.orig/include/IceUtil/Config.h 2013-03-11 15:19:46.000000000 +0000
2	+++ cpp/include/IceUtil/Config.h 2012-09-10 11:43:58.000000000 +0200	2	+++ cpp/include/IceUtil/Config.h 2013-05-20 02:09:58.239194578 +0000
3	@@ -248,3 +248,16 @@ public:	3	@@ -51,7 +51,7 @@
4	#define ICE_DEFAULT_MUTEX_PROTOCOL PrioNone	4	// Check for C++ 11 support
5		5	//
		6	#if (defined(__GNUC__) && (__GNUC__ > 4 \|\| (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)) && defined(__GXX_EXPERIMENTAL_CXX0X__)) \|\| \
		7	- (defined(__clang__) && (__clang_major__ >= 4) && __cplusplus >= 201103) \|\| \
		8	+ (defined(__clang__) && ((defined(__APPLE__) && __clang_major__ >= 4) \|\| (!defined(__APPLE__) && __clang_major__ >= 3)) && __cplusplus >= 201103) \|\| \
		9	(defined(_MSC_VER) && (_MSC_VER >= 1600))
		10	# define ICE_CPP11
6	#endif	11	#endif
7	+
8	+
9	+//
10	+// Macro used for declaring destructors that might throw - required for C++11
11	+//
12	+#if __cplusplus >= 201103L
13	+#define ICE_DESTRUCTORS_DONT_THROW_BY_DEFAULT
14	+#define ICE_NOEXCEPT_FALSE noexcept(false)
15	+#define ICE_NOEXCEPT_TRUE noexcept(true)
16	+#else
17	+#define ICE_NOEXCEPT_FALSE
18	+#define ICE_NOEXCEPT_TRUE
19	+#endif

Lines 1-15 Link Here

(-)./files/patch-cpp-include-IceUtil-Mutex.h (-15 lines)
1	--- cpp.orig/include/IceUtil/Mutex.h 2011-06-15 21:43:58.000000000 +0200
2	+++ cpp/include/IceUtil/Mutex.h 2012-03-04 20:14:52.000000000 +0100
3	@@ -251,8 +251,11 @@
4	inline
5	Mutex::~Mutex()
6	{
7	+#ifndef NDEBUG
8	int rc = 0;
9	- rc = pthread_mutex_destroy(&_mutex);
10	+ rc =
11	+#endif
12	+ pthread_mutex_destroy(&_mutex);
13	assert(rc == 0);
14	}
15

Lines 1-72 Link Here

(-)./files/patch-cpp-include-IceUtil-Shared.h (-72 lines)
1	--- cpp.orig/include/IceUtil/Shared.h 2011-06-15 21:43:58.000000000 +0200
2	+++ cpp/include/IceUtil/Shared.h 2012-09-10 11:43:58.000000000 +0200
3	@@ -50,6 +50,11 @@
4	//
5	// A non thread-safe base class for reference-counted types.
6	//
7	+// IceUtil::SimpleSharedUnsafeDestructor
8	+// =====================
9	+//
10	+// A non thread-safe base class for reference-counted types - destructor might throw.
11	+//
12	// IceUtil::Shared
13	// ===============
14	//
15	@@ -109,6 +114,57 @@ private:
16	bool _noDelete;
17	};
18
19	+class ICE_UTIL_API SimpleSharedUnsafeDestructor
20	+{
21	+public:
22	+
23	+ SimpleSharedUnsafeDestructor();
24	+ SimpleSharedUnsafeDestructor(const SimpleSharedUnsafeDestructor&);
25	+
26	+ virtual ~SimpleSharedUnsafeDestructor() ICE_NOEXCEPT_FALSE
27	+ {
28	+ }
29	+
30	+ SimpleSharedUnsafeDestructor& operator=(const SimpleSharedUnsafeDestructor&)
31	+ {
32	+ return *this;
33	+ }
34	+
35	+ void __incRef()
36	+ {
37	+ assert(_ref >= 0);
38	+ ++_ref;
39	+ }
40	+
41	+ void __decRef()
42	+ {
43	+ assert(_ref > 0);
44	+ if(--_ref == 0)
45	+ {
46	+ if(!_noDelete)
47	+ {
48	+ _noDelete = true;
49	+ delete this;
50	+ }
51	+ }
52	+ }
53	+
54	+ int __getRef() const
55	+ {
56	+ return _ref;
57	+ }
58	+
59	+ void __setNoDelete(bool b)
60	+ {
61	+ _noDelete = b;
62	+ }
63	+
64	+private:
65	+
66	+ int _ref;
67	+ bool _noDelete;
68	+};
69	+
70	class ICE_UTIL_API Shared
71	{
72	public:

Lines 1-29 Link Here

(-)./files/patch-cpp-src-Freeze-MapDb.cpp (-29 lines)
1	--- cpp.orig/src/Freeze/MapDb.cpp 2011-06-15 21:43:58.000000000 +0200
2	+++ cpp/src/Freeze/MapDb.cpp 2012-09-10 11:43:58.000000000 +0200
3	@@ -72,7 +72,13 @@ Freeze::MapDb::~MapDb()
4	}
5	catch(const ::DbException& dx)
6	{
7	+#if defined(ICE_DESTRUCTORS_DONT_THROW_BY_DEFAULT)
8	+ Error out(_communicator->getLogger());
9	+ out << "DbException while closing database " << _dbName << ": "
10	+ << dx.what();
11	+#else
12	throw DatabaseException(__FILE__, __LINE__, dx.what());
13	+#endif
14	}
15	}
16	}
17	@@ -229,7 +229,11 @@
18	#ifndef NDEBUG
19	bool inserted =
20	#endif
21	- _indices.insert(IndexMap::value_type(indexBase->name(), indexI.get())).second;
22	+ _indices.insert(IndexMap::value_type(indexBase->name(), indexI.get()))
23	+#ifndef NDEBUG
24	+ .second
25	+#endif
26	+ ;
27	assert(inserted);
28
29	indexBase->_impl = indexI.release();

Lines 1-41 Link Here

(-)./files/patch-cpp-src-Freeze-MapI.cpp (-41 lines)
1	--- cpp.orig/src/Freeze/MapI.cpp 2011-06-15 21:43:58.000000000 +0200
2	+++ cpp/src/Freeze/MapI.cpp 2012-03-04 20:14:52.000000000 +0100
3	@@ -749,8 +749,11 @@
4
5	try
6	{
7	+#ifndef NDEBUG
8	int err;
9	- err = _dbc->put(&dbKey, &dbValue, DB_CURRENT);
10	+ err =
11	+#endif
12	+ _dbc->put(&dbKey, &dbValue, DB_CURRENT);
13	assert(err == 0);
14	}
15	catch(const ::DbDeadlockException& dx)
16	@@ -1023,7 +1026,11 @@
17	#ifndef NDEBUG
18	bool inserted =
19	#endif
20	- _indices.insert(IndexMap::value_type(indexBase->name(), indexBase)).second;
21	+ _indices.insert(IndexMap::value_type(indexBase->name(), indexBase))
22	+#ifndef NDEBUG
23	+ .second
24	+#endif
25	+ ;
26	assert(inserted);
27	indexBase->_map = this;
28	}
29	@@ -1360,8 +1367,11 @@
30	try
31	{
32	u_int32_t count;
33	+#ifndef NDEBUG
34	int err;
35	- err = _db->truncate(txn, &count, txn != 0 ? 0 : DB_AUTO_COMMIT);
36	+ err =
37	+#endif
38	+ _db->truncate(txn, &count, txn != 0 ? 0 : DB_AUTO_COMMIT);
39	assert(err == 0);
40	break;
41	}

Lines 1-18 Link Here

(-)./files/patch-cpp-src-Freeze-MapI.h (-18 lines)
1	--- cpp.orig/src/Freeze/MapI.h 2011-06-15 21:43:58.000000000 +0200
2	+++ cpp/src/Freeze/MapI.h 2012-09-10 11:43:58.000000000 +0200
3	@@ -63,12 +63,13 @@ public:
4	void
5	close();
6
7	- class Tx : public IceUtil::SimpleShared
8	+ class Tx : public IceUtil::SimpleSharedUnsafeDestructor
9	{
10	public:
11
12	Tx(const MapHelperI&);
13	- ~Tx();
14	+ ~Tx() ICE_NOEXCEPT_FALSE;
15	+ ;
16
17	void dead();
18