update r740

srz-zumix · Nov 13, 2014 · 6b91491 · 6b91491
1 parent d134eab
commit 6b91491
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 9 deletions.
diff --git a/CHANGES b/CHANGES
@@ -10,14 +10,15 @@ Changes for 1.11.0:
 * Matcher に Not,ResultOf,Pointee を追加
 * コンテナMatcher に Each,At,IsEmpty,ElementsAre,ElementsAreArray を追加
 * メンバーMatcher に Key,Pair,Field,Property を追加
-* ワイルドカードMatcher A,_ を追加	
+* ワイルドカードMatcher A,_ を追加
 
 ** 変更
 * コンテナMatcher の Contains から HasSubstr 機能を削除
 
 ** 修正
 * IUTEST_*_FLOAT_EQ,DOUBLE_EQ で NAN の比較が真を返す不具合を修正
 * コンテナMatcher の条件に Matcher を使えるように修正
+* Visual Studio 2015 Preview 対応
 * バグ修正
 
 --------------------------------------------------

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.10.99.37
+PROJECT_NUMBER         = 1.10.99.38
 
 # 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/impl/iutest_debug.ipp b/include/impl/iutest_debug.ipp
@@ -21,7 +21,7 @@
 
 #if defined(_MSC_VER) && _MSC_VER >= 1310
 #  if !defined(IUTEST_OS_WINDOWS_MOBILE) && !defined(IUTEST_OS_WINDOWS_PHONE) && !defined(IUTEST_OS_WINDOWS_RT)
-#    if defined(_MSC_FULL_VER) && (_MSC_FULL_VER <= 190022129)
+#    if defined(_MSC_FULL_VER) && (_MSC_FULL_VER <= 190022310)
 IUTEST_PRAGMA_MSC_WARN_PUSH()
 IUTEST_PRAGMA_MSC_WARN_DISABLE(4091)
 #      include <DbgHelp.h>

diff --git a/include/internal/iutest_compiler.hpp b/include/internal/iutest_compiler.hpp
@@ -558,8 +558,8 @@
 #      define IUTEST_HAS_NOEXCEPT	1
 #    endif
 #  elif defined(_MSC_VER)
-#    if _MSC_FULL_VER == 180021114
-//#      define IUTEST_HAS_NOEXCEPT	1	// build fail
+#    if _MSC_FULL_VER >= 190022310
+//#      define IUTEST_HAS_NOEXCEPT	1 // https://connect.microsoft.com/VisualStudio/feedback/details/809079/torino-compile-error-template-noexcept
 #    endif
 #  elif defined(__INTEL_COMPILER)
 #    if __INTEL_COMPILER >= 1400

diff --git a/include/iutest_ver.hpp b/include/iutest_ver.hpp
@@ -17,11 +17,11 @@
 
 //======================================================================
 // define
-#define IUTEST_VER			0x01109937u //!< iutest version 1.10.99.37
+#define IUTEST_VER			0x01109938u //!< iutest version 1.10.99.38
 #define IUTEST_MAJORVER		0x01u		//!< Major Version
 #define IUTEST_MINORVER		0x10u		//!< Minor Version
 #define IUTEST_BUILD		0x99u		//!< Build
-#define IUTEST_REVISION		0x37u		//!< Revision
+#define IUTEST_REVISION		0x38u		//!< Revision
 
 /**
  * @mainpage
@@ -127,7 +127,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       <li>メンバーMatcher に Key,Pair,Field を追加</li>
       <li>ワイルドカードMatcher A,_ を追加</li>
       <li>IUTEST_*_FLOAT_EQ,DOUBLE_EQ で NAN の比較が真を返す不具合を修正</li>
-    </ul>
+	  <li>Visual Studio 2015 Preview 対応</li>
+	  </ul>
   </li>
   <li>v1.10.0.0
     <ul>

diff --git a/test/CommonMakefile.in b/test/CommonMakefile.in
@@ -102,7 +102,7 @@ TARGETS_IUTEST_ONLY = \
           iutest_ostream_formatter_tests \
           iutest_output_xml_invalid_path_tests \
           iutest_tap_printer_listener_tests \
-          iutest_type_param_tests_strict \
+          iutest_type_param_strict_tests \
           iutest_unit_tests \
 
 BUILD_ONLY = iutest_break_on_failure_tests \

diff --git a/test/iutest_type_param_tests_strict.cpp → test/iutest_type_param_strict_tests.cpp b/test/iutest_type_param_tests_strict.cpp → test/iutest_type_param_strict_tests.cpp