diff options
| author | mcorino <mcorino@remedy.nl> | 2015-05-30 17:41:16 +0200 |
|---|---|---|
| committer | mcorino <mcorino@remedy.nl> | 2015-05-30 17:41:16 +0200 |
| commit | f9ce7915129d21d0deb9a5ead23cd17831310518 (patch) | |
| tree | 6ab444eb3032fb7e9ce60a631ac65383e3147f94 | |
| parent | aef72ee34937ed8f8c4cc5993fc2d21ea9f2fb8e (diff) | |
| parent | 87a419ccb20491fa65e86963c73afe6730a59001 (diff) | |
| download | ATCD-f9ce7915129d21d0deb9a5ead23cd17831310518.tar.gz | |
Merge pull request #86 from mcorino/master
Fix incorrect MSVC pragma warning format.
| -rw-r--r-- | ACE/ace/OS_NS_sys_utsname.cpp | 4 | ||||
| -rw-r--r-- | ACE/ace/Object_Manager_Base.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ACE/ace/OS_NS_sys_utsname.cpp b/ACE/ace/OS_NS_sys_utsname.cpp index 535925bc81c..10d531792d0 100644 --- a/ACE/ace/OS_NS_sys_utsname.cpp +++ b/ACE/ace/OS_NS_sys_utsname.cpp @@ -24,11 +24,11 @@ ACE_OS::uname (ACE_utsname *name) # if defined (ACE_HAS_WIN32_GETVERSION) /* Since MS found it necessary to deprecate these. */ -# pragma warning disable 4996 +# pragma warning(disable:4996) ACE_TEXT_OSVERSIONINFO vinfo; vinfo.dwOSVersionInfoSize = sizeof(ACE_TEXT_OSVERSIONINFO); ACE_TEXT_GetVersionEx (&vinfo); -# pragma warning enable 4996 +# pragma warning(enable:4996) # endif SYSTEM_INFO sinfo; diff --git a/ACE/ace/Object_Manager_Base.cpp b/ACE/ace/Object_Manager_Base.cpp index 6cd773ed13a..da0fde21b4d 100644 --- a/ACE/ace/Object_Manager_Base.cpp +++ b/ACE/ace/Object_Manager_Base.cpp @@ -258,11 +258,11 @@ 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 disable 4996 +# 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(enable:4996) # endif /* ACE_WIN32 */ return 0; } else { |