fix gtest v1.10.0 and latest

srz-zumix · Nov 17, 2019 · f9dd5f2 · f9dd5f2
1 parent 890a820
commit f9dd5f2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/include/gtest/iutest_gmock_ver.hpp b/include/gtest/iutest_gmock_ver.hpp
@@ -6,7 +6,7 @@
  *
  * @author      t.shirayanagi
  * @par         copyright
- * Copyright (C) 2014-2018, Takazumi Shirayanagi\n
+ * Copyright (C) 2014-2019, Takazumi Shirayanagi\n
  * This software is released under the new BSD License,
  * see LICENSE
 */
@@ -26,9 +26,11 @@
 
 //!< Minor Version
 #ifndef GMOCK_MINORVER
-#  if   !defined(GTEST_INCLUDE_GTEST_INTERNAL_GTEST_LINKED_PTR_H_)
-#    define GMOCK_MINORVER  0x08
+#  if   defined(GMOCK_IS_SIGNED_)
+#    define GMOCK_MINORVER  0x10
 #    define GMOCK_LATEST    1
+#  if   defined(GMOCK_INCLUDE_GMOCK_GMOCK_NICE_STRICT_H_)
+#    define GMOCK_MINORVER  0x10
 #  elif defined(GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_)
 #    define GMOCK_MINORVER  0x08
 #  elif defined(GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_CALLBACK_MATCHERS_H_)

diff --git a/include/gtest/iutest_gtest_ver.hpp b/include/gtest/iutest_gtest_ver.hpp
@@ -27,11 +27,11 @@
 
 //!< Minor Version
 #ifndef GTEST_MINORVER
-#  if   defined(GTEST_SKIP)
+#  if   defined(GTEST_TEST_NO_THROW_CATCH_STD_EXCEPTION_)
 #    define GTEST_MINORVER  0x10
 #    define GTEST_LATEST    1
-#  elif !defined(GTEST_INCLUDE_GTEST_INTERNAL_GTEST_LINKED_PTR_H_)
-#    define GTEST_MINORVER  0x08
+#  elif defined(GTEST_SKIP)
+#    define GTEST_MINORVER  0x10
 #  elif defined(GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_)
 #    define GTEST_MINORVER  0x08
 #  elif !defined(RUN_ALL_TESTS) && !defined(GTEST_CREF_WORKAROUND_)