From 94f5f7382cf4e7a81ccae039510b8bc2930bf578 Mon Sep 17 00:00:00 2001 From: srz-zumix Date: Thu, 14 May 2015 08:20:43 +0900 Subject: [PATCH] update r842 --- doc/Doxyfile | 2 +- include/internal/iutest_option_message.hpp | 9 +++++---- include/iutest_ver.hpp | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/doc/Doxyfile b/doc/Doxyfile index b59a1f7686..aa1f39a68a 100644 --- 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.7 +PROJECT_NUMBER = 1.11.99.8 # 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/internal/iutest_option_message.hpp b/include/internal/iutest_option_message.hpp index 68971d24d2..6b48f5c2e7 100644 --- a/include/internal/iutest_option_message.hpp +++ b/include/internal/iutest_option_message.hpp @@ -6,7 +6,7 @@ * * @author t.shirayanagi * @par copyright - * Copyright (C) 2011-2014, Takazumi Shirayanagi\n + * Copyright (C) 2011-2015, Takazumi Shirayanagi\n * This software is released under the new BSD License, * see LICENSE */ @@ -117,6 +117,7 @@ inline void iuOptionMessage::ShowFeature(void) SHOW_MACRO(IUTEST_HAS_MATCHERS); SHOW_MACRO(IUTEST_HAS_MATCHER_ALLOF_AND_ANYOF); SHOW_MACRO(IUTEST_HAS_MATCHER_ELEMENTSARE); + SHOW_MACRO(IUTEST_HAS_MATCHER_REGEX); SHOW_MACRO(IUTEST_HAS_MINIDUMP); SHOW_MACRO(IUTEST_HAS_NULLPTR); SHOW_MACRO(IUTEST_HAS_PACKAGE); @@ -157,6 +158,7 @@ inline void iuOptionMessage::ShowSpec(void) SHOW_MACRO(IUTEST_HAS_CTIME); SHOW_MACRO(IUTEST_HAS_CXX_HDR_CHRONO); SHOW_MACRO(IUTEST_HAS_CXX_HDR_RANDOM); + SHOW_MACRO(IUTEST_HAS_CXX_HDR_REGEX); SHOW_MACRO(IUTEST_HAS_CXX11); SHOW_MACRO(IUTEST_HAS_DELETED_FUNCTIONS); SHOW_MACRO(IUTEST_HAS_EXCEPTIONS); @@ -181,12 +183,11 @@ inline void iuOptionMessage::ShowSpec(void) SHOW_MACRO(IUTEST_HAS_VARIADIC_TEMPLATES); SHOW_MACRO(IUTEST_HAS_VARIADIC_TEMPLATE_TEMPLATES); -#ifdef _IUTEST_DEBUG - #ifdef _MSC_FULL_VER SHOW_MACRO(_MSC_FULL_VER); #endif - +#ifdef _LIBCPP_VERSION + SHOW_MACRO(_LIBCPP_VERSION); #endif #undef SHOW_MACRO diff --git a/include/iutest_ver.hpp b/include/iutest_ver.hpp index a221f107cb..21b92138c5 100644 --- a/include/iutest_ver.hpp +++ b/include/iutest_ver.hpp @@ -17,11 +17,11 @@ //====================================================================== // define -#define IUTEST_VER 0x01119907u //!< iutest version 1.11.99.7 +#define IUTEST_VER 0x01119908u //!< iutest version 1.11.99.8 #define IUTEST_MAJORVER 0x01u //!< Major Version #define IUTEST_MINORVER 0x11u //!< Minor Version #define IUTEST_BUILD 0x99u //!< Build -#define IUTEST_REVISION 0x07u //!< Revision +#define IUTEST_REVISION 0x08u //!< Revision /** * @mainpage