Merge remote-tracking branch 'origin/develop'

srz-zumix · Aug 2, 2019 · 7b19112 · 7b19112
2 parents 5d9fed0 + a836eb4
commit 7b19112
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 28 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -21,8 +21,8 @@ addons:
       - llvm-toolchain-xenial
     packages: &apt-common-packages
       - clang-8
-      - g++-8
-      - gcc-8
+      - g++-9
+      - gcc-9
       #- cppcheck
 
 before_install:
@@ -35,11 +35,11 @@ before_install:
   # g++
   - |
     if [ "${CXX}" = 'g++' ] && [ "${HOST}" != 'WINE' ] && [ "${USE_COVERAGE}" = '' ]; then
-      export CC=gcc-8
-      export CXX=g++-8
-      export CCOV=gcov-8
-      export AR=gcc-ar-8
-      export RANLIB=gcc-ranlib-8
+      export CC=gcc-9
+      export CXX=g++-9
+      export CCOV=gcov-9
+      export AR=gcc-ar-9
+      export RANLIB=gcc-ranlib-9
       #update-alternatives --install /usr/bin/gcc  gcc  /usr/bin/gcc-8  90
       #update-alternatives --install /usr/bin/g++  g++  /usr/bin/g++-8  90
       #update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-8 90
@@ -131,7 +131,7 @@ matrix:
         apt:
           sources: *apt-common-sources
           packages:
-            - *apt-common-packages
+            - clang-8
             - lcov
             - rubygems-integration
     # fused

diff --git a/README.md b/README.md
@@ -135,7 +135,7 @@ Basic test
 |compiler|c++ version|status|
 |:--|:--|:--|
 |clang++-8|c++98/c++11/c++17|[![Travis-CI Build Status](https://travis-ci.com/srz-zumix/iutest.svg?branch=master)](https://travis-ci.com/srz-zumix/iutest)|
-|g++-8|c++98/c++11/c++17|[![Travis-CI Build Status](https://travis-ci.com/srz-zumix/iutest.svg?branch=master)](https://travis-ci.com/srz-zumix/iutest)|
+|g++-9|c++98/c++11/c++17|[![Travis-CI Build Status](https://travis-ci.com/srz-zumix/iutest.svg?branch=master)](https://travis-ci.com/srz-zumix/iutest)|
 |g++-9|c++17|[![Codefresh build status]( https://g.codefresh.io/api/badges/pipeline/srz-zumix/srz-zumix%2Fiutest%2Fiutest_unittest?branch=master&type=cf-1)]( https://g.codefresh.io/pipelines/iutest_unittest/builds?repoOwner=srz-zumix&repoName=iutest&serviceName=srz-zumix%2Fiutest&filter=trigger:build~Build;branch:master;pipeline:58a933be9d1bd40100495882~iutest_unittest)|
 |g++-8|c++17|[![Codefresh build status]( https://g.codefresh.io/api/badges/pipeline/srz-zumix/srz-zumix%2Fiutest%2Fiutest_unittest?branch=master&type=cf-1)]( https://g.codefresh.io/pipelines/iutest_unittest/builds?repoOwner=srz-zumix&repoName=iutest&serviceName=srz-zumix%2Fiutest&filter=trigger:build~Build;branch:master;pipeline:58a933be9d1bd40100495882~iutest_unittest)|
 |g++-7|c++17|[![Codefresh build status]( https://g.codefresh.io/api/badges/pipeline/srz-zumix/srz-zumix%2Fiutest%2Fiutest_unittest?branch=master&type=cf-1)]( https://g.codefresh.io/pipelines/iutest_unittest/builds?repoOwner=srz-zumix&repoName=iutest&serviceName=srz-zumix%2Fiutest&filter=trigger:build~Build;branch:master;pipeline:58a933be9d1bd40100495882~iutest_unittest)|

diff --git a/docs/Doxyfile b/docs/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.16.99.23
+PROJECT_NUMBER         = 1.16.99.24
 
 # 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
@@ -194,6 +194,7 @@ inline void iuOptionMessage::ShowSpec()
     IIUT_SHOW_MACRO(IUTEST_HAS_CXX_HDR_RANDOM);
     IIUT_SHOW_MACRO(IUTEST_HAS_CXX_HDR_REGEX);
     IIUT_SHOW_MACRO(IUTEST_HAS_CXX_HDR_STRING_VIEW);
+    IIUT_SHOW_MACRO(IUTEST_HAS_CXX_HDR_TYPE_TARITS);
     IIUT_SHOW_MACRO(IUTEST_HAS_CXX_HDR_VARIANT);
     IIUT_SHOW_MACRO(IUTEST_HAS_CXX11);
     IIUT_SHOW_MACRO(IUTEST_HAS_CXX14);

diff --git a/include/internal/iutest_type_traits.hpp b/include/internal/iutest_type_traits.hpp
@@ -21,22 +21,22 @@
 
 //======================================================================
 // define
-#ifndef IUTEST_HAS_HDR_TYPETARITS
+#ifndef IUTEST_HAS_CXX_HDR_TYPE_TARITS
 #  if defined(__has_include)
 #    if __has_include( <type_traits> ) && IUTEST_HAS_CXX11
-#      define IUTEST_HAS_HDR_TYPETARITS     1
+#      define IUTEST_HAS_CXX_HDR_TYPE_TARITS     1
 #    endif
 #  elif (defined(__GLIBCXX__) || defined(_LIBCPP_VERSION)) && IUTEST_HAS_CXX11
-#    define IUTEST_HAS_HDR_TYPETARITS       1
+#    define IUTEST_HAS_CXX_HDR_TYPE_TARITS       1
 #  elif defined(_MSC_VER)
 #    if _MSC_VER >= 1600
-#      define IUTEST_HAS_HDR_TYPETARITS     1
+#      define IUTEST_HAS_CXX_HDR_TYPE_TARITS     1
 #    endif
 #  endif
 #endif
 
-#ifndef IUTEST_HAS_HDR_TYPETARITS
-#  define IUTEST_HAS_HDR_TYPETARITS         0
+#ifndef IUTEST_HAS_CXX_HDR_TYPE_TARITS
+#  define IUTEST_HAS_CXX_HDR_TYPE_TARITS         0
 #endif
 
 #ifndef IUTEST_HAS_RVALUE_REFS
@@ -51,7 +51,7 @@
 #  define IUTEST_HAS_RVALUE_REFS    0
 #endif
 
-#if IUTEST_HAS_HDR_TYPETARITS
+#if IUTEST_HAS_CXX_HDR_TYPE_TARITS
 #  include <type_traits>
 #else
 #  if !defined(IUTEST_USE_OWN_IS_MEMBER_FUNCTION_POINTER)
@@ -152,7 +152,7 @@ template<typename T>struct is_member_function_pointer;
 
 #endif
 
-#if IUTEST_HAS_HDR_TYPETARITS
+#if IUTEST_HAS_CXX_HDR_TYPE_TARITS
 
 using ::std::true_type;
 using ::std::false_type;

diff --git a/include/iutest_assertion.hpp b/include/iutest_assertion.hpp
@@ -832,7 +832,7 @@ class NeHelper<true>
 
 }   // end of namespace backward
 
-#if IUTEST_HAS_NULLPTR && IUTEST_HAS_HDR_TYPETARITS && 0
+#if IUTEST_HAS_NULLPTR && IUTEST_HAS_CXX_HDR_TYPE_TARITS && 0
 
 /**
  * @brief   Equal Helper

diff --git a/include/iutest_printers.hpp b/include/iutest_printers.hpp
@@ -304,7 +304,8 @@ inline void PrintTo(const wchar_t value, iu_ostream* os)
     }
     else
     {
-        *os << "\'" << value << "\'";
+        const wchar_t str[2] = { value, L'\0' };
+        *os << "\'" << detail::ShowWideCString(str) << "\'";
     }
 }
 inline void PrintTo(const unsigned char value, iu_ostream* os)

diff --git a/include/iutest_ver.hpp b/include/iutest_ver.hpp
@@ -17,11 +17,11 @@
 
 //======================================================================
 // define
-#define IUTEST_VER          0x01169923u //!< iutest version 1.16.99.23
+#define IUTEST_VER          0x01169924u //!< iutest version 1.16.99.24
 #define IUTEST_MAJORVER     0x01u       //!< Major Version
 #define IUTEST_MINORVER     0x16u       //!< Minor Version
 #define IUTEST_MICROVER     0x99u       //!< Micro Version
-#define IUTEST_REVISION     0x23u       //!< Revision
+#define IUTEST_REVISION     0x24u       //!< Revision
 
 #define IUTEST_BUILD        IUTEST_MICROVER //!< @deprecated
 

diff --git a/test/check_stdlib.cpp b/test/check_stdlib.cpp
@@ -6,7 +6,7 @@
  *
  * @author      t.shirayanagi
  * @par         copyright
- * Copyright (C) 2016, Takazumi Shirayanagi\n
+ * Copyright (C) 2016-2019, Takazumi Shirayanagi\n
  * This software is released under the new BSD License,
  * see LICENSE
 */
@@ -17,6 +17,7 @@
 #include "../include/internal/iutest_pp.hpp"
 #include "../include/internal/iutest_compiler.hpp"
 #include "../include/internal/iutest_stdlib.hpp"
+#include "../include/internal/iutest_type_traits.hpp"
 
 #define SHOW_MACRO(x)   ::std::cout << "#define " #x " " IUTEST_PP_TOSTRING(x) << ::std::endl
 
@@ -26,12 +27,19 @@ int wmain(int , wchar_t* [])
 int main(int , char* [])
 #endif
 {
+    SHOW_MACRO(IUTEST_HAS_CXX_HDR_ANY);
+    SHOW_MACRO(IUTEST_HAS_CXX_HDR_ARRAY);
     SHOW_MACRO(IUTEST_HAS_CXX_HDR_CHRONO);
     SHOW_MACRO(IUTEST_HAS_CXX_HDR_CODECVT);
     SHOW_MACRO(IUTEST_HAS_CXX_HDR_CSTDINT);
     SHOW_MACRO(IUTEST_HAS_CXX_HDR_CUCHAR);
+    SHOW_MACRO(IUTEST_HAS_CXX_HDR_FILESYSTEM);
+    SHOW_MACRO(IUTEST_HAS_CXX_HDR_OPTIONAL);
     SHOW_MACRO(IUTEST_HAS_CXX_HDR_RANDOM);
     SHOW_MACRO(IUTEST_HAS_CXX_HDR_REGEX);
+    SHOW_MACRO(IUTEST_HAS_CXX_HDR_STRING_VIEW);
+    SHOW_MACRO(IUTEST_HAS_CXX_HDR_TYPE_TARITS);
+    SHOW_MACRO(IUTEST_HAS_CXX_HDR_VARIANT);
     SHOW_MACRO(IUTEST_HAS_HDR_CXXABI);
     SHOW_MACRO(IUTEST_HAS_HDR_SYSTIME);
 #ifdef IUTEST_LIBSTDCXX_VERSION
@@ -42,6 +50,8 @@ int main(int , char* [])
     SHOW_MACRO(IUTEST_HAS_STD_DECLVAL);
     SHOW_MACRO(IUTEST_HAS_STD_EMPLACE);
     SHOW_MACRO(IUTEST_HAS_STD_QUICK_EXIT);
+    SHOW_MACRO(IUTEST_HAS_STD_STR_TO_VALUE);
+    SHOW_MACRO(IUTEST_HAS_STD_TO_CHARS);
     SHOW_MACRO(IUTEST_HAS_STD_TUPLE);
     SHOW_MACRO(IUTEST_HAS_TR1_TUPLE);
 

diff --git a/test/printers_tests.cpp b/test/printers_tests.cpp
@@ -204,11 +204,11 @@ IUTEST(PrintToTest, WideString)
         wchar_t c = L'\n';
         IUTEST_SUCCEED() << ::iutest::PrintToString(c);
     }
-//  {
-//      LogChecker ck("\'A\'");
-//      wchar_t c = L'A';
-//      IUTEST_SUCCEED() << ::iutest::PrintToString(c);
-//  }
+    {
+        LogChecker ck("\'A\'");
+        wchar_t c = L'A';
+        IUTEST_SUCCEED() << ::iutest::PrintToString(c);
+    }
     {
         LogChecker ck("(null)");
         wchar_t* p = NULL;