summaryrefslogtreecommitdiff
path: root/cpp/test/Ice/invoke/BlobjectI.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/test/Ice/invoke/BlobjectI.cpp')
-rw-r--r--cpp/test/Ice/invoke/BlobjectI.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/test/Ice/invoke/BlobjectI.cpp b/cpp/test/Ice/invoke/BlobjectI.cpp
index 7d7d3612a43..cd45f924f44 100644
--- a/cpp/test/Ice/invoke/BlobjectI.cpp
+++ b/cpp/test/Ice/invoke/BlobjectI.cpp
@@ -114,7 +114,7 @@ BlobjectArrayAsyncI::ice_invoke_async(const Ice::AMD_Object_ice_invokePtr& cb,
vector<Ice::Byte> outEncaps;
bool ok = invokeInternal(in, outEncaps, current);
#if (defined(_MSC_VER) && (_MSC_VER >= 1600))
- pair<const Ice::Byte*, const Ice::Byte*> outPair(nullptr, nullptr);
+ pair<const Ice::Byte*, const Ice::Byte*> outPair(static_cast<const Ice::Byte*>(nullptr), static_cast<const Ice::Byte*>(nullptr));
#else
pair<const Ice::Byte*, const Ice::Byte*> outPair(0, 0);
#endif