diff options
| author | Billy Donahue <BillyDonahue@users.noreply.github.com> | 2015-11-10 17:47:45 -0500 |
|---|---|---|
| committer | Billy Donahue <BillyDonahue@users.noreply.github.com> | 2015-11-10 17:47:45 -0500 |
| commit | 5bd7c2b589e3cef554496fce85236de7be3e62db (patch) | |
| tree | 631d4919bea349b58146df3d649e3771b1f34953 /googletest/include/gtest | |
| parent | cf517375efb5581dc0f187275ebce964c34e4a3f (diff) | |
| parent | a0435dc6879c336ab29afd64c380995055d2cd53 (diff) | |
| download | googletest-5bd7c2b589e3cef554496fce85236de7be3e62db.tar.gz | |
Merge pull request #611 from mark-chromium/gmock_cxx11
googlemock: Support C++11 language with pre-C++11 library
Diffstat (limited to 'googletest/include/gtest')
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h index d768bd6a..d570090d 100644 --- a/googletest/include/gtest/internal/gtest-port.h +++ b/googletest/include/gtest/internal/gtest-port.h @@ -358,8 +358,9 @@ # define GTEST_HAS_STD_FUNCTION_ 1 # define GTEST_HAS_STD_INITIALIZER_LIST_ 1 # define GTEST_HAS_STD_MOVE_ 1 -# define GTEST_HAS_STD_UNIQUE_PTR_ 1 # define GTEST_HAS_STD_SHARED_PTR_ 1 +# define GTEST_HAS_STD_TYPE_TRAITS_ 1 +# define GTEST_HAS_STD_UNIQUE_PTR_ 1 #endif // C++11 specifies that <tuple> provides std::tuple. |