Skip to content

G
googletest
Commit 15d61e42 by kosak
Options

Implement threading support for gmock on Windows.

Replace U+2013 with U+002D in comment lines. Pull in gtest 681.
parent c26f9695
Showing with 7 additions and 3 deletions
src/gmock-matchers.cc
...@@ -191,9 +191,9 @@ GTEST_API_ string FormatMatcherDescription(bool negation, ...@@ -191,9 +191,9 @@ GTEST_API_ string FormatMatcherDescription(bool negation,
// . [ sink ] . // . [ sink ] .
// //
// See Also: // See Also:
// [1] Cormen, et al (2001). "Section 26.2: The Ford–Fulkerson method". // [1] Cormen, et al (2001). "Section 26.2: The Ford-Fulkerson method".
// "Introduction to Algorithms (Second ed.)", pp. 651–664. // "Introduction to Algorithms (Second ed.)", pp. 651-664.
// [2] "Ford–Fulkerson algorithm", Wikipedia, // [2] "Ford-Fulkerson algorithm", Wikipedia,
// 'http://en.wikipedia.org/wiki/Ford%E2%80%93Fulkerson_algorithm' // 'http://en.wikipedia.org/wiki/Ford%E2%80%93Fulkerson_algorithm'
class MaxBipartiteMatchState { class MaxBipartiteMatchState {
public: public:
......
test/gmock-matchers_test.cc
...@@ -33,6 +33,10 @@ ...@@ -33,6 +33,10 @@
// //
// This file tests some commonly used argument matchers. // 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-matchers.h"
#include "gmock/gmock-more-matchers.h" #include "gmock/gmock-more-matchers.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment