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, 43 insertions, 40 deletions

diff --git a/cpp/test/Ice/slicing/objects/AllTests.cpp b/cpp/test/Ice/slicing/objects/AllTests.cpp
index a6e472d6404..874542d9732 100644
--- a/cpp/test/Ice/slicing/objects/AllTests.cpp
+++ b/cpp/test/Ice/slicing/objects/AllTests.cpp
@@ -642,7 +642,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         catch(...)
         {
-            test(0);
+            test(false);
         }
         SBasePtr sb = SBasePtr::dynamicCast(o);
         test(sb);
@@ -668,7 +668,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         catch(...)
         {
-            test(0);
+            test(false);
         }
     }
     cout << "ok" << endl;
@@ -691,7 +691,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         catch(...)
         {
-            test(0);
+            test(false);
         }
         SBSKnownDerivedPtr sbskd = SBSKnownDerivedPtr::dynamicCast(sb);
         test(sbskd);
@@ -717,7 +717,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         catch(...)
         {
-            test(0);
+            test(false);
         }
     }
     cout << "ok" << endl;
@@ -740,7 +740,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         catch(...)
         {
-            test(0);
+            test(false);
         }
     }
     cout << "ok" << endl;
@@ -758,15 +758,18 @@ allTests(const Ice::CommunicatorPtr& communicator)
         Ice::ObjectPtr o;
         try
         {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+            IceUtil::DummyBCC dummy;
+#endif
             o = test->SUnknownAsObject();
-            test(0);
+            test(false);
         }
         catch(const Ice::NoObjectFactoryException&)
         {
         }
         catch(...)
         {
-            test(0);
+            test(false);
         }
     }
     cout << "ok" << endl;
@@ -781,7 +784,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         catch(...)
         {
-            test(0);
+            test(false);
         }
     }
     cout << "ok" << endl;
@@ -798,7 +801,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         catch(...)
         {
-            test(0);
+            test(false);
         }
     }
     cout << "ok" << endl;
@@ -828,7 +831,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         catch(...)
         {
-            test(0);
+            test(false);
         }
     }
     cout << "ok" << endl;
@@ -867,7 +870,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         catch(...)
         {
-            test(0);
+            test(false);
         }
     }
     cout << "ok" << endl;
@@ -900,7 +903,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         catch(...)
         {
-            test(0);
+            test(false);
         }
     }
     cout << "ok" << endl;
@@ -937,7 +940,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         catch(...)
         {
-            test(0);
+            test(false);
         }
     }
     cout << "ok" << endl;
@@ -974,7 +977,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         catch(...)
         {
-            test(0);
+            test(false);
         }
     }
     cout << "ok" << endl;
@@ -1011,7 +1014,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         catch(...)
         {
-            test(0);
+            test(false);
         }
     }
     cout << "ok" << endl;
@@ -1027,7 +1030,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         catch(...)
         {
-            test(0);
+            test(false);
         }
     }
     cout << "ok" << endl;
@@ -1051,7 +1054,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         catch(...)
         {
-            test(0);
+            test(false);
         }
     }
     cout << "ok" << endl;
@@ -1104,7 +1107,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         catch(...)
         {
-            test(0);
+            test(false);
         }
     }
     cout << "ok" << endl;
@@ -1152,7 +1155,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         catch(...)
         {
-            test(0);
+            test(false);
         }
     }
     cout << "ok" << endl;
@@ -1197,7 +1200,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         catch(...)
         {
-            test(0);
+            test(false);
         }
     }
     cout << "ok" << endl;
@@ -1245,7 +1248,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         catch(...)
         {
-            test(0);
+            test(false);
         }
     }
     cout << "ok" << endl;
@@ -1275,7 +1278,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         catch(...)
         {
-            test(0);
+            test(false);
         }
     }
     cout << "ok" << endl;
@@ -1307,7 +1310,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         catch(...)
         {
-            test(0);
+            test(false);
         }
     }
     cout << "ok" << endl;
@@ -1348,7 +1351,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         catch(...)
         {
-            test(0);
+            test(false);
         }
     }
     cout << "ok" << endl;
@@ -1383,7 +1386,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         catch(...)
         {
-            test(0);
+            test(false);
         }
     }
     cout << "ok" << endl;
@@ -1418,7 +1421,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         catch(...)
         {
-            test(0);
+            test(false);
         }
     }
     cout << "ok" << endl;
@@ -1456,7 +1459,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         catch(...)
         {
-            test(0);
+            test(false);
         }
     }
     cout << "ok" << endl;
@@ -1543,7 +1546,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         catch(const ::Ice::Exception&)
         {
-            test(0);
+            test(false);
         }
     }
     cout << "ok" << endl;
@@ -1633,7 +1636,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         catch(const ::Ice::Exception&)
         {
-            test(0);
+            test(false);
         }
     }
     cout << "ok" << endl;
@@ -1690,7 +1693,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         catch(const ::Ice::Exception&)
         {
-            test(0);
+            test(false);
         }
     }
     cout << "ok" << endl;
@@ -1751,7 +1754,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         catch(const ::Ice::Exception&)
         {
-            test(0);
+            test(false);
         }
     }
     cout << "ok" << endl;
@@ -1761,7 +1764,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         try
         {
             test->throwBaseAsBase();
-            test(0);
+            test(false);
         }
         catch(const BaseException& e)
         {
@@ -1773,7 +1776,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         catch(...)
         {
-            test(0);
+            test(false);
         }
     }
     cout << "ok" << endl;
@@ -1791,7 +1794,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         try
         {
             test->throwDerivedAsBase();
-            test(0);
+            test(false);
         }
         catch(const DerivedException& e)
         {
@@ -1809,7 +1812,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         catch(...)
         {
-            test(0);
+            test(false);
         }
     }
     cout << "ok" << endl;
@@ -1827,7 +1830,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         try
         {
             test->throwDerivedAsDerived();
-            test(0);
+            test(false);
         }
         catch(const DerivedException& e)
         {
@@ -1845,7 +1848,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         catch(...)
         {
-            test(0);
+            test(false);
         }
     }
     cout << "ok" << endl;
@@ -1863,7 +1866,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         try
         {
             test->throwUnknownDerivedAsBase();
-            test(0);
+            test(false);
         }
         catch(const BaseException& e)
         {
@@ -1875,7 +1878,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         catch(...)
         {
-            test(0);
+            test(false);
         }
     }
     cout << "ok" << endl;
@@ -1898,7 +1901,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         catch(...)
         {
-            test(0);
+            test(false);
         }
     }
     cout << "ok" << endl;