diff options
| author | kosak <kosak@google.com> | 2014-03-24 22:08:24 +0000 |
|---|---|---|
| committer | kosak <kosak@google.com> | 2014-03-24 22:08:24 +0000 |
| commit | 15d61e42bdd4182e7c4b50bcb3314b006ce578c7 (patch) | |
| tree | cff1b309456fd85f169b14c7b6b98fd02caa632d /test | |
| parent | c26f969579d62444ae7d422b37e0037ceca97a7a (diff) | |
| download | googletest-15d61e42bdd4182e7c4b50bcb3314b006ce578c7.tar.gz googletest-15d61e42bdd4182e7c4b50bcb3314b006ce578c7.tar.bz2 googletest-15d61e42bdd4182e7c4b50bcb3314b006ce578c7.zip | |
Implement threading support for gmock on Windows.
Replace U+2013 with U+002D in comment lines.
Pull in gtest 681.
Diffstat (limited to 'test')
| -rw-r--r-- | test/gmock-matchers_test.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/test/gmock-matchers_test.cc b/test/gmock-matchers_test.cc index bd20add2..68a027bf 100644 --- a/test/gmock-matchers_test.cc +++ b/test/gmock-matchers_test.cc @@ -33,6 +33,10 @@ // // This file tests some commonly used argument matchers. +// windows.h defines macros which conflict with standard identifiers used in +// this test. Defining this symbol prevents windows.h from doing that. +#define NOMINMAX + #include "gmock/gmock-matchers.h" #include "gmock/gmock-more-matchers.h" |