Commits

Anonymous committed ecde734

Implement threading support for gmock on Windows.
Replace U+2013 with U+002D in comment lines.
Pull in gtest 681.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@4718415998a-534a-0410-bf83-d39667b30386

  • Participants
  • Parent commits b73472d

Comments (0)

Files changed (2)

File src/gmock-matchers.cc

 // .                                         [ 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:

File test/gmock-matchers_test.cc

 //
 // 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"