C++11 updates for IceLocatorDiscovery

- Fixes IceLocatorDiscovery to build with new C++11 mapping
- Fixes to C++11 mapping for Bloject and ice_invoke async versions

1 files changed, 6 insertions, 4 deletions

diff --git a/cpp/test/Ice/invoke/BlobjectI.cpp b/cpp/test/Ice/invoke/BlobjectI.cpp
index 68e18223365..6ec24555023 100644
--- a/cpp/test/Ice/invoke/BlobjectI.cpp
+++ b/cpp/test/Ice/invoke/BlobjectI.cpp
@@ -97,18 +97,20 @@ BlobjectArrayI::ice_invoke(const pair<const Ice::Byte*, const Ice::Byte*>& inEnc
 #ifdef ICE_CPP11_MAPPING
 void
 BlobjectAsyncI::ice_invoke_async(vector<Ice::Byte> inEncaps,
-                                 function<void (bool, const vector<Ice::Byte>&)> response,
+                                 function<void (bool, vector<Ice::Byte>)> response,
+                                 function<void (exception_ptr)>,
                                  const Ice::Current& current)
 {
     Ice::InputStreamPtr in = Ice::createInputStream(current.adapter->getCommunicator(), inEncaps);
     vector<Ice::Byte> outEncaps;
     bool ok = invokeInternal(in, outEncaps, current);
-    response(ok, outEncaps);
+    response(ok, move(outEncaps));
 }
 
 void
 BlobjectArrayAsyncI::ice_invoke_async(pair<const Ice::Byte*, const Ice::Byte*> inEncaps,
-                                      function<void (bool, const pair<const Ice::Byte*, const Ice::Byte*>&)> response,
+                                      function<void (bool, pair<const Ice::Byte*, const Ice::Byte*>)> response,
+                                      function<void (exception_ptr)>,
                                       const Ice::Current& current)
 {
     Ice::InputStreamPtr in = Ice::createInputStream(current.adapter->getCommunicator(), inEncaps);
@@ -124,7 +126,7 @@ BlobjectArrayAsyncI::ice_invoke_async(pair<const Ice::Byte*, const Ice::Byte*> i
         outPair.first = &outEncaps[0];
         outPair.second = &outEncaps[0] + outEncaps.size();
     }
-    response(ok, outPair);
+    response(ok, move(outPair));
 }
 #else
 void