diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2017-08-08 09:08:32 +0200 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2017-08-08 09:08:32 +0200 |
| commit | a76b70b2dfaa6de7f38faae869ec3006eb706d36 (patch) | |
| tree | 6740b3d34bfe4be45b01449e526ded92a754691d | |
| parent | df5e559b7fb1c76379f317d4ece7a4aa7035d593 (diff) | |
| download | ATCD-a76b70b2dfaa6de7f38faae869ec3006eb706d36.tar.gz | |
Fixed warning with clang
* ACE/tests/Malloc_Test.cpp:
| -rw-r--r-- | ACE/tests/Malloc_Test.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/ACE/tests/Malloc_Test.cpp b/ACE/tests/Malloc_Test.cpp index cf4594a4405..3fc62140064 100644 --- a/ACE/tests/Malloc_Test.cpp +++ b/ACE/tests/Malloc_Test.cpp @@ -302,7 +302,7 @@ child (void) return 0; } -#if defined (ACE_WIN32) +#if defined (ACE_HAS_WIN32_GETVERSION) // On Win9x/Me, a shared address needs to be on the shared arena, // between the second and third megabyte in the virtual address space // of the process. Also, a mapped view of a file is shared on the same @@ -315,8 +315,15 @@ child (void) static void get_base_addrs (void) { +# if defined(__clang__) +# pragma clang diagnostic push +# pragma clang diagnostic ignored "-Wdeprecated-declarations" +# endif /* __clang__ */ OSVERSIONINFO vinfo; vinfo.dwOSVersionInfoSize = sizeof (OSVERSIONINFO); +# if defined(__clang__) +# pragma clang diagnostic pop +# endif /* __clang__ */ if (::GetVersionEx(&vinfo) == 0) return; @@ -328,12 +335,12 @@ get_base_addrs (void) CHILD_BASE_ADDR = CHILD_ADDR_DELTA + (char*) PARENT_BASE_ADDR; } -#endif /* defined (ACE_WIN32) */ +#endif /* defined (ACE_HAS_WIN32_GETVERSION) */ int run_main (int argc, ACE_TCHAR *argv[]) { -#if defined (ACE_WIN32) +#if defined (ACE_HAS_WIN32_GETVERSION) get_base_addrs(); #endif |