summaryrefslogtreecommitdiff
path: root/cpp/src/IcePatch2/FileServerI.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/IcePatch2/FileServerI.cpp')
-rwxr-xr-x[-rw-r--r--]cpp/src/IcePatch2/FileServerI.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/cpp/src/IcePatch2/FileServerI.cpp b/cpp/src/IcePatch2/FileServerI.cpp
index 62bfa08ac68..cee2e9fe934 100644..100755
--- a/cpp/src/IcePatch2/FileServerI.cpp
+++ b/cpp/src/IcePatch2/FileServerI.cpp
@@ -84,7 +84,12 @@ IcePatch2::FileServerI::getFileCompressed_async(const AMD_FileServer_getFileComp
return;
}
+#if (defined(_MSC_VER) && (_MSC_VER >= 1600))
+ pair<const Byte*, const Byte*> ret(nullptr, nullptr);
+#else
pair<const Byte*, const Byte*> ret(0, 0);
+#endif
+
if(num <= 0 || pos < 0)
{
cb->ice_response(ret);