testing/gmock/src/gmock-spec-builders.cc - Issue 1151006: Update to current gtest/gmock.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: testing/gmock/src/gmock-spec-builders.cc

Issue 1151006: Update to current gtest/gmock. (Closed)

Patch Set: rebase Created 10 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: testing/gmock/src/gmock-spec-builders.cc

diff --git a/testing/gmock/src/gmock-spec-builders.cc b/testing/gmock/src/gmock-spec-builders.cc

index 02a3227fb13d50631b97a1682baac0b821daf901..dab1a2c95710d9ce71d072a87f40795d968f2428 100644

--- a/testing/gmock/src/gmock-spec-builders.cc

+++ b/testing/gmock/src/gmock-spec-builders.cc

@@ -53,7 +53,7 @@ namespace internal {

// Protects the mock object registry (in class Mock), all function

// mockers, and all expectations.

-Mutex g_gmock_mutex(Mutex::NO_CONSTRUCTOR_NEEDED_FOR_STATIC_MUTEX);

+GTEST_DEFINE_STATIC_MUTEX_(g_gmock_mutex);

// Constructs an ExpectationBase object.

ExpectationBase::ExpectationBase(const char* a_file,