diff options
| author | Bernard Normier <bernard@zeroc.com> | 2010-05-13 11:50:03 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2010-05-13 11:50:03 -0400 |
| commit | 700eed3207129c277c245fec9fdebfa099a0f77e (patch) | |
| tree | 16dc801d327c8c9e27066f007745a09d73dbb8c0 /cpp/test/Ice/invoke/BlobjectI.cpp | |
| parent | bug 4725 - generate one shot constructor for structs (diff) | |
| download | ice-700eed3207129c277c245fec9fdebfa099a0f77e.tar.bz2 ice-700eed3207129c277c245fec9fdebfa099a0f77e.tar.xz ice-700eed3207129c277c245fec9fdebfa099a0f77e.zip | |
Squashed commit of the following:
commit f25399b006e5b15b46e4258546d80e1d006e1bc1
Author: U-bwin7\bernard <bernard@bwin7.(none)>
Date: Thu May 13 11:41:01 2010 -0400
VS2010 port
Diffstat (limited to 'cpp/test/Ice/invoke/BlobjectI.cpp')
| -rwxr-xr-x[-rw-r--r--] | cpp/test/Ice/invoke/BlobjectI.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cpp/test/Ice/invoke/BlobjectI.cpp b/cpp/test/Ice/invoke/BlobjectI.cpp index a3b51ada7ca..7e64ee26f18 100644..100755 --- a/cpp/test/Ice/invoke/BlobjectI.cpp +++ b/cpp/test/Ice/invoke/BlobjectI.cpp @@ -103,7 +103,11 @@ BlobjectArrayAsyncI::ice_invoke_async(const Ice::AMD_Object_ice_invokePtr& cb, Ice::InputStreamPtr in = Ice::createInputStream(current.adapter->getCommunicator(), inParams); vector<Ice::Byte> outParams; bool ok = invokeInternal(in, outParams, current); +#if (defined(_MSC_VER) && (_MSC_VER >= 1600)) + pair<const Ice::Byte*, const Ice::Byte*> outPair(nullptr, nullptr); +#else pair<const Ice::Byte*, const Ice::Byte*> outPair(0, 0); +#endif if(outParams.size() != 0) { outPair.first = &outParams[0]; |