update r848

srz-zumix · May 17, 2015 · 62b4b2f · 62b4b2f
1 parent 0e821b0
commit 62b4b2f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/doc/Doxyfile b/doc/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = iutest
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.11.99.11
+PROJECT_NUMBER         = 1.11.99.12
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/include/gtest/switch/iutest_switch_gmock.hpp b/include/gtest/switch/iutest_switch_gmock.hpp
@@ -72,6 +72,17 @@
 #if defined(IUTEST_USE_GMOCK)
 
 namespace testing {
+
+#if GMOCK_VER < 0x01070000
+
+template <typename T, typename A>
+inline internal::ElementsAreArrayMatcher<T> ElementsAreArray(const ::std::vector<T, A>& vec)
+{
+	return ElementsAreArray(vec.begin(), vec.size());
+}
+
+#endif
+
 namespace matchers
 {
 

diff --git a/include/iutest_ver.hpp b/include/iutest_ver.hpp
@@ -17,11 +17,11 @@
 
 //======================================================================
 // define
-#define IUTEST_VER			0x01119911u //!< iutest version 1.11.99.11
+#define IUTEST_VER			0x01119912u //!< iutest version 1.11.99.12
 #define IUTEST_MAJORVER		0x01u		//!< Major Version
 #define IUTEST_MINORVER		0x11u		//!< Minor Version
 #define IUTEST_BUILD		0x99u		//!< Build
-#define IUTEST_REVISION		0x11u		//!< Revision
+#define IUTEST_REVISION		0x12u		//!< Revision
 
 /**
  * @mainpage