Merge remote-tracking branch 'upstream/develop' into feature/basic_string

Author: yamasdais

Diff for: .travis.yml

@@ -48,7 +48,15 @@ matrix:
 
     # Clang 5.0
     - env: UNIT_TESTS=true COMPILER=clang++-5.0 BOOST_VERSION=default ENABLE_MEMCHECK=true
-      addons: &defaults { apt: { packages: ["clang-5.0", "valgrind"], sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-5.0"] } }
+      addons: { apt: { packages: ["clang-5.0", "valgrind"], sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-5.0"] } }
+
+    # Clang 6.0
+    - env: UNIT_TESTS=true COMPILER=clang++-6.0 BOOST_VERSION=default ENABLE_MEMCHECK=true
+      addons: { apt: { packages: ["clang-6.0", "valgrind"], sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-6.0"] } }
+
+    # Clang 7.0
+    - env: UNIT_TESTS=true COMPILER=clang++-7 BOOST_VERSION=default ENABLE_MEMCHECK=true
+      addons: &defaults { apt: { packages: ["clang-7", "valgrind"], sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-7"] } }
 
     # GCC 6
     - env: UNIT_TESTS=true COMPILER=g++-6 BOOST_VERSION=default ENABLE_MEMCHECK=true
@@ -58,6 +66,10 @@ matrix:
     - env: UNIT_TESTS=true COMPILER=g++-7 BOOST_VERSION=default ENABLE_MEMCHECK=true
       addons: { apt: { packages: ["g++-7", "valgrind"], sources: ["ubuntu-toolchain-r-test"] } }
 
+    # GCC 8
+    - env: UNIT_TESTS=true COMPILER=g++-8 BOOST_VERSION=default ENABLE_MEMCHECK=true
+      addons: { apt: { packages: ["g++-8", "valgrind"], sources: ["ubuntu-toolchain-r-test"] } }
+
     # Xcode 6.4
     - os: osx
       env: UNIT_TESTS=true BOOST_VERSION=default
@@ -81,12 +93,16 @@ matrix:
     ##########################################################################
     # Build with variations in the configuration
     ##########################################################################
-    # With C++17 instead of C++14, on Clang
-    - env: UNIT_TESTS=true COMPILER=default BOOST_VERSION=default CMAKE_OPTIONS="-DBOOST_HANA_ENABLE_CPP17=ON"
+    # With C++17, on Clang
+    - env: UNIT_TESTS=true COMPILER=default BOOST_VERSION=default CMAKE_OPTIONS="-DCMAKE_CXX_STANDARD=17 -DCMAKE_CXX_STANDARD_REQUIRED=ON"
+      addons: *defaults
+
+    # With C++20, on Clang
+    - env: UNIT_TESTS=true COMPILER=default BOOST_VERSION=default CMAKE_OPTIONS="-DCMAKE_CXX_STANDARD=20 -DCMAKE_CXX_STANDARD_REQUIRED=ON"
       addons: *defaults
 
-    # With C++17 instead of C++14, on GCC
-    - env: UNIT_TESTS=true COMPILER=g++-6     BOOST_VERSION=default CMAKE_OPTIONS="-DBOOST_HANA_ENABLE_CPP17=ON"
+    # With C++17, on GCC
+    - env: UNIT_TESTS=true COMPILER=g++-6     BOOST_VERSION=default CMAKE_OPTIONS="-DCMAKE_CXX_STANDARD=17 -DCMAKE_CXX_STANDARD_REQUIRED=ON"
       addons: { apt: { packages: ["g++-6", "valgrind"], sources: ["ubuntu-toolchain-r-test"] } }
 
     # Without concept checks
@@ -161,7 +177,7 @@ install:
   ############################################################################
   # Setup default versions and override CXX set by Travis if needed
   ############################################################################
-  - if [[ "${COMPILER}" == "default" ]]; then COMPILER=clang++-5.0; fi
+  - if [[ "${COMPILER}" == "default" ]]; then COMPILER=clang++-7; fi
   - if [[ "${BOOST_VERSION}" == "default" ]]; then BOOST_VERSION=1.66.0; fi
 
   - if [[ "${COMPILER}" != "" ]]; then export CXX=${COMPILER}; fi
@@ -222,7 +238,9 @@ install:
       elif [[ "${CXX}" == "clang++-3.8" ]]; then LLVM_VERSION="3.8.1";
       elif [[ "${CXX}" == "clang++-3.9" ]]; then LLVM_VERSION="3.9.1";
       elif [[ "${CXX}" == "clang++-4.0" ]]; then LLVM_VERSION="4.0.1";
-      elif [[ "${CXX}" == "clang++-5.0" ]]; then LLVM_VERSION="5.0.1";
+      elif [[ "${CXX}" == "clang++-5.0" ]]; then LLVM_VERSION="5.0.2";
+      elif [[ "${CXX}" == "clang++-6.0" ]]; then LLVM_VERSION="6.0.1";
+      elif [[ "${CXX}" == "clang++-7" ]];   then LLVM_VERSION="7.0.1";
       fi
 
       LLVM_URL="http://llvm.org/releases/${LLVM_VERSION}/llvm-${LLVM_VERSION}.src.tar.xz"

Diff for: CMakeLists.txt

@@ -10,7 +10,6 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 ##############################################################################
 option(BOOST_HANA_ENABLE_CONCEPT_CHECKS "Enable concept checking in the interface methods." ON)
 option(BOOST_HANA_ENABLE_DEBUG_MODE "Enable Hana's debug mode." OFF)
-option(BOOST_HANA_ENABLE_CPP17 "Build with C++17 instead of usual required C++ standard. Useful for testing." OFF)
 
 option(BOOST_HANA_ENABLE_STRING_UDL
 "Enable the GNU extension allowing the special string literal operator\
@@ -50,11 +49,7 @@ include(CheckCxxCompilerSupport)
 include(CheckCXXCompilerFlag)
 add_library(hana INTERFACE)
 target_include_directories(hana INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>")
-if (BOOST_HANA_ENABLE_CPP17)
-    target_compile_features(hana INTERFACE cxx_std_17)
-else()
-    target_compile_features(hana INTERFACE cxx_std_14)
-endif()
+target_compile_features(hana INTERFACE cxx_std_14)
 
 # Export the `hana` library into a HanaConfig.cmake file
 install(TARGETS hana
@@ -86,14 +81,15 @@ function(boost_hana_set_test_properties target)
     endmacro()
 
     if (NOT MSVC)
-        setflag(BOOST_HANA_HAS_FDIAGNOSTICS_COLOR        -fdiagnostics-color)
-        setflag(BOOST_HANA_HAS_FTEMPLATE_BACKTRACE_LIMIT -ftemplate-backtrace-limit=0)
-        setflag(BOOST_HANA_HAS_PEDANTIC                  -pedantic)
-        setflag(BOOST_HANA_HAS_WALL                      -Wall)
-        setflag(BOOST_HANA_HAS_WERROR                    -Werror)
-        setflag(BOOST_HANA_HAS_WEXTRA                    -Wextra)
-        setflag(BOOST_HANA_HAS_WNO_UNUSED_LOCAL_TYPEDEFS -Wno-unused-local-typedefs)
-        setflag(BOOST_HANA_HAS_WWRITE_STRINGS            -Wwrite-strings)
+        setflag(BOOST_HANA_HAS_FDIAGNOSTICS_COLOR         -fdiagnostics-color)
+        setflag(BOOST_HANA_HAS_FTEMPLATE_BACKTRACE_LIMIT  -ftemplate-backtrace-limit=0)
+        setflag(BOOST_HANA_HAS_PEDANTIC                   -pedantic)
+        setflag(BOOST_HANA_HAS_WALL                       -Wall)
+        setflag(BOOST_HANA_HAS_WERROR                     -Werror)
+        setflag(BOOST_HANA_HAS_WEXTRA                     -Wextra)
+        setflag(BOOST_HANA_HAS_WNO_SELF_ASSIGN_OVERLOADED -Wno-self-assign-overloaded)
+        setflag(BOOST_HANA_HAS_WNO_UNUSED_LOCAL_TYPEDEFS  -Wno-unused-local-typedefs)
+        setflag(BOOST_HANA_HAS_WWRITE_STRINGS             -Wwrite-strings)
     else()
         setflag(BOOST_HANA_HAS_MSVC_EHSC                 -EHsc)
         setflag(BOOST_HANA_HAS_MSVC_BIGOBJ               -bigobj)

Diff for: doc/tutorial.hpp

@@ -846,7 +846,7 @@ constexpr auto operator"" _c() {
   // parse the digits and return an integral_constant
 }
 
-auto three = 1_c + 3_c;
+auto three = 1_c + 2_c;
 @endcode
 
 Hana provides its own `integral_constant`s, which define arithmetic operators
@@ -860,7 +860,7 @@ your namespace before using it:
 @code{cpp}
 using namespace hana::literals;
 
-auto three = 1_c + 3_c;
+auto three = 1_c + 2_c;
 @endcode
 
 This way, you may do compile-time arithmetic without having to struggle with

Diff for: include/boost/hana/version.hpp

@@ -24,7 +24,7 @@ Distributed under the Boost Software License, Version 1.0.
 
 //! @ingroup group-config
 //! Macro expanding to the minor version of the library, i.e. the `y` in `x.y.z`.
-#define BOOST_HANA_MINOR_VERSION 5
+#define BOOST_HANA_MINOR_VERSION 6
 
 //! @ingroup group-config
 //! Macro expanding to the patch level of the library, i.e. the `z` in `x.y.z`.

Diff for: test/functional.cpp

@@ -22,6 +22,7 @@ template <int i = 0>
 struct undefined { };
 
 struct move_only {
+    move_only() = default;
     move_only(move_only&&) = default;
     move_only(move_only const&) = delete;
 };