diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2017-08-09 08:41:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-09 08:41:13 +0200 |
| commit | ae6d62ca5a0c011d883dbfe330a5dc8bae0d7ac3 (patch) | |
| tree | 59768769001415eddc111b7ded4ad00ab18bc542 | |
| parent | cb2bea59ab06ed4e1887c2bb86b04653dd0fee05 (diff) | |
| parent | 08e91a5f675152759c0fb794644ce43b94749911 (diff) | |
| download | ATCD-ae6d62ca5a0c011d883dbfe330a5dc8bae0d7ac3.tar.gz | |
Merge pull request #474 from jwillemsen/master
Corrected placing pragma pop for bcc32c
| -rw-r--r-- | ACE/tests/Malloc_Test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ACE/tests/Malloc_Test.cpp b/ACE/tests/Malloc_Test.cpp index 3fc62140064..31fc68e9af0 100644 --- a/ACE/tests/Malloc_Test.cpp +++ b/ACE/tests/Malloc_Test.cpp @@ -321,11 +321,11 @@ get_base_addrs (void) # endif /* __clang__ */ OSVERSIONINFO vinfo; vinfo.dwOSVersionInfoSize = sizeof (OSVERSIONINFO); + if (::GetVersionEx(&vinfo) == 0) + return; # if defined(__clang__) # pragma clang diagnostic pop # endif /* __clang__ */ - if (::GetVersionEx(&vinfo) == 0) - return; if (vinfo.dwPlatformId == VER_PLATFORM_WIN32_NT && vinfo.dwMajorVersion >= 4) |