Merge remote-tracking branch 'origin/encoding11' into mx

Conflicts:
	cpp/config/Make.rules.Darwin
	cpp/src/Ice/ConnectionFactory.cpp
	cpp/src/Ice/ConnectionI.h

1 files changed, 12 insertions, 1 deletions

diff --git a/cpp/test/Ice/dispatcher/Client.cpp b/cpp/test/Ice/dispatcher/Client.cpp
index da86ee480af..8060023eeac 100644
--- a/cpp/test/Ice/dispatcher/Client.cpp
+++ b/cpp/test/Ice/dispatcher/Client.cpp
@@ -29,13 +29,24 @@ main(int argc, char* argv[])
 {
     int status;
     Ice::CommunicatorPtr communicator;
-
+    
     try
     {
         Ice::InitializationData initData;
         initData.properties = Ice::createProperties(argc, argv);
+#ifdef ICE_CPP11
+        Ice::DispatcherPtr dispatcher = new Dispatcher();
+        initData.dispatcher = Ice::newDispatcher(
+            [=](const Ice::DispatcherCallPtr& call, const Ice::ConnectionPtr& conn)
+                {
+                    dispatcher->dispatch(call, conn);
+                });
+#else
         initData.dispatcher = new Dispatcher();
+#endif
         communicator = Ice::initialize(argc, argv, initData);
+        
+
         status = run(argc, argv, communicator);
     }
     catch(const Ice::Exception& ex)