diff options
| author | mcorino <mcorino@remedy.nl> | 2015-05-31 14:52:09 +0200 |
|---|---|---|
| committer | mcorino <mcorino@remedy.nl> | 2015-05-31 14:52:09 +0200 |
| commit | f6999de8de25305011db12c60f7c7268c1a3b717 (patch) | |
| tree | 45f2c45a06a233b14ce5b7c3a8d867f6b3997b34 | |
| parent | f9ce7915129d21d0deb9a5ead23cd17831310518 (diff) | |
| parent | 636d2e64ab16a78bb6e281326ef6bcf69ca08081 (diff) | |
| download | ATCD-f6999de8de25305011db12c60f7c7268c1a3b717.tar.gz | |
Merge pull request #87 from mcorino/master
Fix MSVC14 pragma warning syntax
| -rw-r--r-- | ACE/ace/OS_NS_sys_utsname.cpp | 3 | ||||
| -rw-r--r-- | ACE/ace/Object_Manager_Base.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
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; diff --git a/ACE/ace/Object_Manager_Base.cpp b/ACE/ace/Object_Manager_Base.cpp index da0fde21b4d..dfb1c1fa927 100644 --- a/ACE/ace/Object_Manager_Base.cpp +++ b/ACE/ace/Object_Manager_Base.cpp @@ -258,11 +258,12 @@ ACE_OS_Object_Manager::init (void) # if defined (ACE_WIN32) && defined (ACE_HAS_WIN32_GETVERSION) /* Since MS found it necessary to deprecate these. */ +# pragma warning(push) # pragma warning(disable:4996) ACE_OS::win32_versioninfo_.dwOSVersionInfoSize = sizeof (ACE_TEXT_OSVERSIONINFO); ACE_TEXT_GetVersionEx (&ACE_OS::win32_versioninfo_); -# pragma warning(enable:4996) +# pragma warning(pop) # endif /* ACE_WIN32 */ return 0; } else { |