merging, merging

This commit is contained in:
Gennadiy Civil
2018-03-13 16:02:05 -04:00
parent a719320a3c
commit 2814b4b089
2 changed files with 23 additions and 39 deletions

View File

@@ -371,6 +371,8 @@
# define GTEST_HAS_STD_MOVE_ 1
# define GTEST_HAS_STD_UNIQUE_PTR_ 1
# define GTEST_HAS_STD_SHARED_PTR_ 1
# define GTEST_HAS_UNORDERED_MAP_ 1
# define GTEST_HAS_UNORDERED_SET_ 1
#endif
// C++11 specifies that <tuple> provides std::tuple.