Merge commit 'origin/R3_3_branch'

Conflicts:
	CHANGES
	cpp/demo/Freeze/backup/.depend
	cpp/demo/Freeze/bench/.depend
	cpp/demo/Freeze/casino/.depend
	cpp/demo/Freeze/customEvictor/.depend
	cpp/demo/Freeze/library/.depend
	cpp/demo/Freeze/phonebook/.depend
	cpp/demo/Freeze/transform/.depend
	cpp/demo/Glacier2/callback/.depend
	cpp/demo/Glacier2/chat/.depend
	cpp/demo/Ice/async/.depend
	cpp/demo/Ice/bidir/.depend
	cpp/demo/Ice/callback/.depend
	cpp/demo/Ice/converter/.depend
	cpp/demo/Ice/hello/.depend
	cpp/demo/Ice/invoke/.depend
	cpp/demo/Ice/latency/.depend
	cpp/demo/Ice/minimal/.depend
	cpp/demo/Ice/multicast/.depend
	cpp/demo/Ice/nested/.depend
	cpp/demo/Ice/nrvo/.depend
	cpp/demo/Ice/session/.depend
	cpp/demo/Ice/throughput/.depend
	cpp/demo/Ice/value/.depend
	cpp/demo/IceBox/hello/.depend
	cpp/demo/IceGrid/allocate/.depend
	cpp/demo/IceGrid/icebox/.depend
	cpp/demo/IceGrid/replication/.depend
	cpp/demo/IceGrid/sessionActivation/.depend
	cpp/demo/IceGrid/simple/.depend
	cpp/demo/IceStorm/clock/.depend
	cpp/demo/IceStorm/counter/.depend
	cpp/demo/IceStorm/replicated/.depend
	cpp/demo/IceStorm/replicated2/.depend
	cpp/demo/book/freeze_filesystem/.depend
	cpp/demo/book/lifecycle/.depend
	cpp/demo/book/printer/.depend
	cpp/demo/book/simple_filesystem/.depend
	cpp/src/Freeze/.depend
	cpp/src/FreezeScript/.depend
	cpp/src/Ice/.depend
	cpp/src/Ice/UdpTransceiver.cpp
	cpp/src/Ice/UdpTransceiver.h
	cpp/src/IceBox/.depend
	cpp/src/IceGrid/.depend
	cpp/src/IceGridLib/.depend
	cpp/src/IcePatch2/.depend
	cpp/src/IceStorm/.depend
	cpp/src/slice2freeze/.depend
	cpp/test/Freeze/complex/.depend
	cpp/test/Freeze/dbmap/.depend
	cpp/test/Freeze/evictor/.depend
	cpp/test/Freeze/oldevictor/.depend
	cpp/test/FreezeScript/dbmap/.depend
	cpp/test/FreezeScript/evictor/.depend
	cpp/test/Glacier2/attack/.depend
	cpp/test/Glacier2/dynamicFiltering/.depend
	cpp/test/Glacier2/router/.depend
	cpp/test/Glacier2/sessionControl/.depend
	cpp/test/Glacier2/ssl/.depend
	cpp/test/Glacier2/staticFiltering/.depend
	cpp/test/Ice/adapterDeactivation/.depend
	cpp/test/Ice/background/.depend
	cpp/test/Ice/binding/.depend
	cpp/test/Ice/checksum/.depend
	cpp/test/Ice/checksum/server/.depend
	cpp/test/Ice/custom/.depend
	cpp/test/Ice/exceptions/.depend
	cpp/test/Ice/facets/.depend
	cpp/test/Ice/faultTolerance/.depend
	cpp/test/Ice/gc/.depend
	cpp/test/Ice/hold/.depend
	cpp/test/Ice/inheritance/.depend
	cpp/test/Ice/interceptor/.depend
	cpp/test/Ice/location/.depend
	cpp/test/Ice/objects/.depend
	cpp/test/Ice/operations/.depend
	cpp/test/Ice/proxy/.depend
	cpp/test/Ice/retry/.depend
	cpp/test/Ice/servantLocator/.depend
	cpp/test/Ice/slicing/exceptions/.depend
	cpp/test/Ice/slicing/objects/.depend
	cpp/test/Ice/stream/.depend
	cpp/test/Ice/stringConverter/.depend
	cpp/test/Ice/timeout/.depend
	cpp/test/Ice/udp/.depend
	cpp/test/IceBox/configuration/.depend
	cpp/test/IceGrid/activation/.depend
	cpp/test/IceGrid/allocation/.depend
	cpp/test/IceGrid/deployer/.depend
	cpp/test/IceGrid/distribution/.depend
	cpp/test/IceGrid/replicaGroup/.depend
	cpp/test/IceGrid/replication/.depend
	cpp/test/IceGrid/session/.depend
	cpp/test/IceGrid/simple/.depend
	cpp/test/IceGrid/update/.depend
	cpp/test/IceSSL/configuration/.depend
	cpp/test/IceStorm/federation/.depend
	cpp/test/IceStorm/federation2/.depend
	cpp/test/IceStorm/rep1/.depend
	cpp/test/IceStorm/repgrid/.depend
	cpp/test/IceStorm/repstress/.depend
	cpp/test/IceStorm/single/.depend
	cpp/test/IceStorm/stress/.depend
	cpp/test/Slice/keyword/.depend
	cs/src/Ice/Instance.cs
	cs/src/IceSSL/ConnectorI.cs
	java/demo/book/simple_filesystem/Filesystem/DirectoryI.java
	java/demo/book/simple_filesystem/Filesystem/FileI.java
	java/src/IceInternal/TcpConnector.java
	java/src/IceSSL/ConnectorI.java
	py/modules/IcePy/.depend
	rb/src/IceRuby/.depend

1 files changed, 126 insertions, 0 deletions

diff --git a/cpp/test/IceGrid/allocation/AllTests.cpp b/cpp/test/IceGrid/allocation/AllTests.cpp
index d1a833788fb..db223ae8ee1 100644
--- a/cpp/test/IceGrid/allocation/AllTests.cpp
+++ b/cpp/test/IceGrid/allocation/AllTests.cpp
@@ -214,6 +214,9 @@ public:
         os << "stress-" << IceUtilInternal::random(6) + 1;
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+        IceUtil::DummyBCC dummy;
+#endif
             return session->allocateObjectById(_communicator->stringToIdentity(os.str()));
         }
         catch(const AllocationTimeoutException&)
@@ -233,6 +236,9 @@ public:
     {
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+        IceUtil::DummyBCC dummy;
+#endif
             return session->allocateObjectByType("::StressTest");
         }
         catch(const AllocationTimeoutException&)
@@ -419,6 +425,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
 
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             session1->allocateObjectById(communicator->stringToIdentity("dummy"));
         }
         catch(const ObjectNotRegisteredException&)
@@ -426,6 +435,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             session1->releaseObject(communicator->stringToIdentity("dummy"));
         }
         catch(const ObjectNotRegisteredException&)
@@ -434,6 +446,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
 
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             session1->allocateObjectById(communicator->stringToIdentity("nonallocatable"));
             test(false);
         }
@@ -447,6 +462,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
 
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             session2->allocateObjectById(communicator->stringToIdentity("nonallocatable"));
             test(false);
         }
@@ -460,6 +478,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
 
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             session1->releaseObject(communicator->stringToIdentity("nonallocatable"));
             test(false);
         }
@@ -473,6 +494,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
 
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             session2->releaseObject(communicator->stringToIdentity("nonallocatable"));
             test(false);
         }
@@ -487,6 +511,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
         session1->allocateObjectById(allocatable);
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             session1->allocateObjectById(allocatable);
             test(false);
         }
@@ -499,6 +526,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
 
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             session2->allocateObjectById(allocatable);
             test(false);
         }
@@ -507,6 +537,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             session2->releaseObject(allocatable);
             test(false);
         }
@@ -517,6 +550,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
         session1->allocateObjectById(allocatablebis);
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             session2->allocateObjectById(allocatablebis);
             test(false);
         }
@@ -527,6 +563,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
         session2->allocateObjectById(allocatablebis);
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             session1->allocateObjectById(allocatablebis);
             test(false);
         }
@@ -547,6 +586,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
         session1->setAllocationTimeout(0);
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             session1->allocateObjectById(allocatable);
             test(false);
         }
@@ -555,6 +597,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             session1->releaseObject(allocatable);
             test(false);
         }
@@ -582,6 +627,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
 
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             obj = session1->allocateObjectByType("::Unknown");
             test(false);
         }
@@ -595,6 +643,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
 
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             obj = session1->allocateObjectByType("::NotAllocatable");
             test(false);
         }
@@ -610,6 +661,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
         test(obj && obj->ice_getIdentity().name == "allocatable");
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             session1->allocateObjectByType("::Test");
             test(false);
         }
@@ -618,6 +672,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             session2->allocateObjectByType("::Test");
             test(false);
         }
@@ -626,6 +683,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             session2->releaseObject(obj->ice_getIdentity());
         }
         catch(const AllocationException&)
@@ -635,6 +695,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
         session1->releaseObject(obj->ice_getIdentity());
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             session1->releaseObject(obj->ice_getIdentity());
         }
         catch(const AllocationException&)
@@ -645,6 +708,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
         test(obj && obj->ice_getIdentity().name == "allocatable");
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             session2->allocateObjectByType("::Test");
             test(false);
         }
@@ -653,6 +719,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             session1->allocateObjectByType("::Test");
             test(false);
         }
@@ -662,6 +731,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
         session1->allocateObjectByType("::TestBis");
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             session2->allocateObjectByType("::TestBis");
             test(false);
         }
@@ -672,6 +744,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
         session2->allocateObjectByType("::TestBis");
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             session1->allocateObjectByType("::TestBis");
             test(false);
         }
@@ -700,6 +775,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
         session2->setAllocationTimeout(500);
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             session2->allocateObjectById(allocatable);
             test(false);
         }
@@ -710,6 +788,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
         time = IceUtil::Time::now();
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             session2->allocateObjectById(allocatable);
             test(false);
         }
@@ -720,6 +801,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
         time = IceUtil::Time::now();
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             session2->allocateObjectByType("::Test");
             test(false);
         }
@@ -744,6 +828,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
         session1->allocateObjectById(allocatable3);
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             session2->allocateObjectById(allocatable3);
             test(false);
         }
@@ -752,6 +839,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             session2->allocateObjectById(allocatable4);
             test(false);
         }
@@ -763,6 +853,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
         session1->releaseObject(allocatable3);
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             session2->allocateObjectById(allocatable3);
             test(false);
         }
@@ -773,6 +866,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
         session2->allocateObjectById(allocatable3);
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             session1->allocateObjectById(allocatable3);
             test(false);
         }
@@ -781,6 +877,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             session1->allocateObjectById(allocatable4);
             test(false);
         }
@@ -791,6 +890,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
         session2->releaseObject(allocatable3);
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             session1->allocateObjectById(allocatable3);
             test(false);
         }
@@ -799,6 +901,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             session1->allocateObjectByType("::TestServer1");
             test(false);
         }
@@ -807,6 +912,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             session1->allocateObjectByType("::TestServer2");
             test(false);
         }
@@ -816,6 +924,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
         test(session2->allocateObjectByType("::TestServer1"));
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             session2->allocateObjectByType("::TestServer1");
             test(false);
         }
@@ -824,6 +935,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             session2->allocateObjectByType("::TestServer2");
             test(false);
         }
@@ -864,6 +978,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
         test(session1->allocateObjectByType("::TestMultipleByServer"));
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             session2->allocateObjectByType("::TestMultipleByServer");
             test(false);
         }
@@ -876,6 +993,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
         test(session2->allocateObjectByType("::TestMultipleByServer"));
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             session1->allocateObjectByType("::TestMultipleByServer");
             test(false);
         }
@@ -892,6 +1012,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
         test(obj2);
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             session1->allocateObjectByType("::TestMultipleServer");
             test(false);
         }
@@ -900,6 +1023,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             session2->allocateObjectByType("::TestMultipleServer");
             test(false);
         }