Implement threading support for gmock on Windows.

Replace U+2013 with U+002D in comment lines. Pull in gtest 681.
2014-03-24 22:08:24 +00:00
parent c26f969579
commit 15d61e42bd
2 changed files with 7 additions and 3 deletions
--- 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"