diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2013-05-17 09:32:07 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2013-05-17 09:32:07 +0000 |
| commit | 5d11c9e5b15ee1faa5ec758a532c1478fae57f7a (patch) | |
| tree | a2390bcab58e5bf2879fdad03dc6dbc85842efbc | |
| parent | 694e92f0a34831f4552c51966f59049cf1b8648c (diff) | |
| download | ATCD-5d11c9e5b15ee1faa5ec758a532c1478fae57f7a.tar.gz | |
Fri May 17 09:32:04 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>
* tests/tests.mpc:
Add NOMINMAX to macros for compiler features test 16/17
| -rw-r--r-- | ACE/ChangeLog | 5 | ||||
| -rw-r--r-- | ACE/tests/tests.mpc | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 65a9483d951..e269fb1359a 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Fri May 17 09:32:04 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/tests.mpc: + Add NOMINMAX to macros for compiler features test 16/17 + Fri May 17 09:26:22 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> * tests/Compiler_Features_19_Test.cpp: diff --git a/ACE/tests/tests.mpc b/ACE/tests/tests.mpc index 2e839bec36b..704010d4130 100644 --- a/ACE/tests/tests.mpc +++ b/ACE/tests/tests.mpc @@ -655,6 +655,7 @@ project(Compiler_Features_16_Test) : acetest { Source_Files { Compiler_Features_16_Test.cpp } + macros += NOMINMAX // Don't #define min and max in Win32 headers } project(Compiler_Features_17_Test) : acetest { @@ -662,6 +663,7 @@ project(Compiler_Features_17_Test) : acetest { Source_Files { Compiler_Features_17_Test.cpp } + macros += NOMINMAX // Don't #define min and max in Win32 headers } project(Compiler_Features_18_Test) : acetest { |