summaryrefslogtreecommitdiff
path: root/java/Socket.cpp
diff options
context:
space:
mode:
authormalosek <malosek@fastmq.com>2009-09-08 14:54:52 +0200
committermalosek <malosek@fastmq.com>2009-09-08 14:54:52 +0200
commitb3fc14522574ccad233bee02ea135d8a93fb2441 (patch)
treee02c81fa44c08bf690d405c8f57dc3be68a01e8e /java/Socket.cpp
parent2a4a10c8be92c5ce6314378fc4de163888075279 (diff)
parent3069b6bd54486346f7bfcce58d6a5e34d129965c (diff)
Merge branch 'master' of git@github.com:sustrik/zeromq2
Diffstat (limited to 'java/Socket.cpp')
-rw-r--r--java/Socket.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/java/Socket.cpp b/java/Socket.cpp
index f87c298..51ee816 100644
--- a/java/Socket.cpp
+++ b/java/Socket.cpp
@@ -35,7 +35,14 @@ static void raise_exception (JNIEnv *env, int err)
assert (exception_class);
// Get text description of the exception.
+#if defined _MSC_VER
+#pragma warning (push)
+#pragma warning (disable:4996)
+#endif
const char *err_msg = strerror (err);
+#if defined _MSC_VER
+#pragma warning (pop)
+#endif
// Raise the exception.
int rc = env->ThrowNew (exception_class, err_msg);