Merge pull request #611 from mark-chromium/gmock_cxx11

googlemock: Support C++11 language with pre-C++11 library
This commit is contained in:
Billy Donahue
2015-11-10 17:47:45 -05:00
4 changed files with 12 additions and 11 deletions

View File

@@ -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.