From d933f8a18bf2bfc2165183bee3772308416fd140 Mon Sep 17 00:00:00 2001
From: Martin Corino <mcorino@remedy.nl>
Date: Sun, 31 May 2015 10:25:14 +0200
Subject: Oops. Fix MSVC pragma warning syntax.

    * ACE/ace/OS_NS_sys_utsname.cpp:
    * ACE/ace/Object_Manager_Base.cpp:
---
 ACE/ace/OS_NS_sys_utsname.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'ACE/ace/OS_NS_sys_utsname.cpp')

diff --git a/ACE/ace/OS_NS_sys_utsname.cpp b/ACE/ace/OS_NS_sys_utsname.cpp
index 10d531792d0..f2e6db46560 100644
--- a/ACE/ace/OS_NS_sys_utsname.cpp
+++ b/ACE/ace/OS_NS_sys_utsname.cpp
@@ -24,11 +24,12 @@ ACE_OS::uname (ACE_utsname *name)
 
 # if defined (ACE_HAS_WIN32_GETVERSION)
   /* Since MS found it necessary to deprecate these. */
+#   pragma warning(push)
 #   pragma warning(disable:4996)
   ACE_TEXT_OSVERSIONINFO vinfo;
   vinfo.dwOSVersionInfoSize = sizeof(ACE_TEXT_OSVERSIONINFO);
   ACE_TEXT_GetVersionEx (&vinfo);
-#   pragma warning(enable:4996)
+#   pragma warning(pop)
 # endif
 
   SYSTEM_INFO sinfo;
-- 
cgit v1.2.1