diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2017-08-07 21:58:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-07 21:58:10 +0200 |
| commit | 36e066d32c90d7a036925b878e179bdac6ac7a19 (patch) | |
| tree | 44dca53ecca28abd9b2f9cce7ae624ec06920dd2 | |
| parent | 7b1f419dd99112817f78b479c23794899e18c0f7 (diff) | |
| parent | 22f7f39f2afe326585566d3178595bfd644bfc88 (diff) | |
| download | ATCD-36e066d32c90d7a036925b878e179bdac6ac7a19.tar.gz | |
Merge pull request #465 from jwillemsen/jwi-clang-warnings
Disable deprecated warnings when using clang
| -rw-r--r-- | ACE/ace/OS_NS_sys_utsname.cpp | 7 | ||||
| -rw-r--r-- | ACE/ace/Object_Manager_Base.cpp | 7 | ||||
| -rw-r--r-- | ACE/tests/tests.mpc | 8 |
3 files changed, 20 insertions, 2 deletions
diff --git a/ACE/ace/OS_NS_sys_utsname.cpp b/ACE/ace/OS_NS_sys_utsname.cpp index 00ae563e431..fd561ebac61 100644 --- a/ACE/ace/OS_NS_sys_utsname.cpp +++ b/ACE/ace/OS_NS_sys_utsname.cpp @@ -27,9 +27,16 @@ ACE_OS::uname (ACE_utsname *name) /* Since MS found it necessary to deprecate these. */ # pragma warning(push) # pragma warning(disable:4996) +# if defined(__clang__) +# pragma clang diagnostic push +# pragma clang diagnostic ignored "-Wdeprecated-declarations" +# endif /* __clang__ */ ACE_TEXT_OSVERSIONINFO vinfo; vinfo.dwOSVersionInfoSize = sizeof(ACE_TEXT_OSVERSIONINFO); ACE_TEXT_GetVersionEx (&vinfo); +# if defined(__clang__) +# pragma clang diagnostic pop +# endif /* __clang__ */ # pragma warning(pop) # endif diff --git a/ACE/ace/Object_Manager_Base.cpp b/ACE/ace/Object_Manager_Base.cpp index 47cd32c36bf..9e17e8210cd 100644 --- a/ACE/ace/Object_Manager_Base.cpp +++ b/ACE/ace/Object_Manager_Base.cpp @@ -282,9 +282,16 @@ ACE_OS_Object_Manager::init (void) /* Since MS found it necessary to deprecate these. */ # pragma warning(push) # pragma warning(disable:4996) +# if defined(__clang__) +# pragma clang diagnostic push +# pragma clang diagnostic ignored "-Wdeprecated-declarations" +# endif /* __clang__ */ ACE_OS::win32_versioninfo_.dwOSVersionInfoSize = sizeof (ACE_TEXT_OSVERSIONINFO); ACE_TEXT_GetVersionEx (&ACE_OS::win32_versioninfo_); +# if defined(__clang__) +# pragma clang diagnostic pop +# endif /* __clang__ */ # pragma warning(pop) # endif /* ACE_WIN32 */ return 0; diff --git a/ACE/tests/tests.mpc b/ACE/tests/tests.mpc index b27430f5f77..76bf41c7bf3 100644 --- a/ACE/tests/tests.mpc +++ b/ACE/tests/tests.mpc @@ -678,7 +678,9 @@ project(Compiler_Features_16_Test) : acetest { Source_Files { Compiler_Features_16_Test.cpp } - macros += NOMINMAX // Don't #define min and max in Win32 headers + specific(prop:microsoft) { + macros += NOMINMAX // Don't #define min and max in Win32 headers + } } project(Compiler_Features_17_Test) : acetest { @@ -686,7 +688,9 @@ project(Compiler_Features_17_Test) : acetest { Source_Files { Compiler_Features_17_Test.cpp } - macros += NOMINMAX // Don't #define min and max in Win32 headers + specific(prop:microsoft) { + macros += NOMINMAX // Don't #define min and max in Win32 headers + } } project(Compiler_Features_18_Test) : acetest { |