diff options
author | Martin Corino <mcorino@remedy.nl> | 2015-05-30 17:38:15 +0200 |
---|---|---|
committer | Martin Corino <mcorino@remedy.nl> | 2015-05-30 17:38:15 +0200 |
commit | 87a419ccb20491fa65e86963c73afe6730a59001 (patch) | |
tree | a37db8b8c07bbde2810e062e4fb741d67900bcf2 | |
parent | 4cc58ce93b93e07f2d73228ad7c621c7fccbd2f6 (diff) | |
download | ATCD-87a419ccb20491fa65e86963c73afe6730a59001.tar.gz |
Fix incorrect MSVC pragma warning format.
* ACE/ace/OS_NS_sys_utsname.cpp:
* ACE/ace/Object_Manager_Base.cpp:
-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 { |