diff options
| author | Benjamin Kramer <benny.kra@googlemail.com> | 2010-06-02 22:02:30 +0000 |
|---|---|---|
| committer | Benjamin Kramer <benny.kra@googlemail.com> | 2010-06-02 22:02:30 +0000 |
| commit | 57240ff6e2252f8986f6e47e4010bc52fbae25d1 (patch) | |
| tree | dacdd66eb30eedab81795672528b6888def253f7 /utils/unittest/googletest/include/gtest/internal/gtest-linked_ptr.h | |
| parent | 190f8ee25a6977ac6eb71b816498df42f17ad9a7 (diff) | |
Merge gtest-1.5.0.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@105354 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils/unittest/googletest/include/gtest/internal/gtest-linked_ptr.h')
| -rw-r--r-- | utils/unittest/googletest/include/gtest/internal/gtest-linked_ptr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/utils/unittest/googletest/include/gtest/internal/gtest-linked_ptr.h b/utils/unittest/googletest/include/gtest/internal/gtest-linked_ptr.h index d4c7a39b0e..2404ea8824 100644 --- a/utils/unittest/googletest/include/gtest/internal/gtest-linked_ptr.h +++ b/utils/unittest/googletest/include/gtest/internal/gtest-linked_ptr.h @@ -77,7 +77,7 @@ namespace testing { namespace internal { // Protects copying of all linked_ptr objects. -extern Mutex g_linked_ptr_mutex; +GTEST_API_ GTEST_DECLARE_STATIC_MUTEX_(g_linked_ptr_mutex); // This is used internally by all instances of linked_ptr<>. It needs to be // a non-template class because different types of linked_ptr<> can refer to |