summaryrefslogtreecommitdiff
path: root/cpp/src/IcePatch2/FileServerI.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2013-01-11 00:37:06 +0100
committerJose <jose@zeroc.com>2013-01-11 00:37:06 +0100
commit047677f816eb972a75213f3ed62dfc03368c2736 (patch)
tree93b55e4a0a749515d10b79a911929fef14154fb7 /cpp/src/IcePatch2/FileServerI.cpp
parentOS X installer relocation issues (diff)
downloadice-047677f816eb972a75213f3ed62dfc03368c2736.tar.bz2
ice-047677f816eb972a75213f3ed62dfc03368c2736.tar.xz
ice-047677f816eb972a75213f3ed62dfc03368c2736.zip
Fixed (ICE-5181) - unreferenced formal parameter
Diffstat (limited to 'cpp/src/IcePatch2/FileServerI.cpp')
-rw-r--r--cpp/src/IcePatch2/FileServerI.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/IcePatch2/FileServerI.cpp b/cpp/src/IcePatch2/FileServerI.cpp
index 666b8d121de..0c7ca517942 100644
--- a/cpp/src/IcePatch2/FileServerI.cpp
+++ b/cpp/src/IcePatch2/FileServerI.cpp
@@ -85,7 +85,7 @@ IcePatch2::FileServerI::getFileCompressed_async(const AMD_FileServer_getFileComp
}
#if (defined(_MSC_VER) && (_MSC_VER >= 1600))
- pair<const Byte*, const Byte*> ret(nullptr, nullptr);
+ pair<const Byte*, const Byte*> ret(static_cast<const Byte*>(nullptr), static_cast<const Byte*>(nullptr));
#else
pair<const Byte*, const Byte*> ret(0, 0);
#endif