diff options
| -rw-r--r-- | src/gmock-matchers.cc | 6 | ||||
| -rw-r--r-- | test/gmock-matchers_test.cc | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/gmock-matchers.cc b/src/gmock-matchers.cc index 9ed29abf..e7424510 100644 --- a/src/gmock-matchers.cc +++ b/src/gmock-matchers.cc @@ -191,9 +191,9 @@ GTEST_API_ string FormatMatcherDescription(bool negation, // . [ sink ] . // // See Also: -// [1] Cormen, et al (2001). "Section 26.2: The Ford–Fulkerson method". -// "Introduction to Algorithms (Second ed.)", pp. 651–664. -// [2] "Ford–Fulkerson algorithm", Wikipedia, +// [1] Cormen, et al (2001). "Section 26.2: The Ford-Fulkerson method". +// "Introduction to Algorithms (Second ed.)", pp. 651-664. +// [2] "Ford-Fulkerson algorithm", Wikipedia, // 'http://en.wikipedia.org/wiki/Ford%E2%80%93Fulkerson_algorithm' class MaxBipartiteMatchState { public: 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" |