Reorder includes to avoid ::gets error under Clang 3.8, 3.9

Disable constexpr on Clang/libstdc++4.8
Reorder Travis configurations
2025-12-26 00:38:08 +01:00 · 2018-07-19 19:48:20 +03:00 · 2018-07-19 19:04:53 +03:00 · 2018-07-19 19:00:14 +03:00 · 2018-07-19 18:27:57 +03:00 · 2018-07-09 13:50:27 +03:00
5 changed files with 135 additions and 6 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -109,7 +109,7 @@ matrix:

    - os: linux
      compiler: g++-7
-      env: UBSAN=1 TOOLSET=gcc COMPILER=g++-7 CXXSTD=03,11,14,17 UBSAN_OPTIONS=print_stacktrace=1
+      env: UBSAN=1 TOOLSET=gcc COMPILER=g++-7 CXXSTD=03,11,14,17 UBSAN_OPTIONS=print_stacktrace=1 LINKFLAGS=-fuse-ld=gold
      addons:
        apt:
          packages:
@@ -117,6 +117,16 @@ matrix:
          sources:
            - ubuntu-toolchain-r-test

+    - os: linux
+      compiler: g++-8
+      env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=03,11,14,17
+      addons:
+        apt:
+          packages:
+            - g++-8
+          sources:
+            - ubuntu-toolchain-r-test
+
    - os: linux
      compiler: clang++
      env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11
@@ -160,6 +170,18 @@ matrix:
            - ubuntu-toolchain-r-test
            - llvm-toolchain-precise-3.6

+    - os: linux
+      compiler: clang++-3.6
+      env: TOOLSET=clang COMPILER=clang++-3.6 CXXSTD=03,11,14,1z
+      addons:
+        apt:
+          packages:
+            - clang-3.6
+            - libstdc++-4.9-dev
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-precise-3.6
+
    - os: linux
      compiler: clang++-3.7
      env: TOOLSET=clang COMPILER=clang++-3.7 CXXSTD=03,11,14,1z
@@ -171,6 +193,29 @@ matrix:
            - ubuntu-toolchain-r-test
            - llvm-toolchain-precise-3.7

+    - os: linux
+      compiler: clang++-3.7
+      env: TOOLSET=clang COMPILER=clang++-3.7 CXXSTD=03,11,14,1z
+      addons:
+        apt:
+          packages:
+            - clang-3.7
+            - libstdc++-4.9-dev
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-precise-3.7
+
+    - os: linux
+      compiler: clang++-3.8
+      env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=03,11,14,1z
+      addons:
+        apt:
+          packages:
+            - clang-3.8
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-precise-3.8
+
    - os: linux
      compiler: clang++-3.8
      env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=03,11,14,1z
@@ -183,6 +228,17 @@ matrix:
            - ubuntu-toolchain-r-test
            - llvm-toolchain-precise-3.8

+    - os: linux
+      compiler: clang++-3.9
+      env: TOOLSET=clang COMPILER=clang++-3.9 CXXSTD=03,11,14,1z
+      addons:
+        apt:
+          packages:
+            - clang-3.9
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-precise-3.9
+
    - os: linux
      compiler: clang++-3.9
      env: TOOLSET=clang COMPILER=clang++-3.9 CXXSTD=03,11,14,1z
@@ -195,6 +251,17 @@ matrix:
            - ubuntu-toolchain-r-test
            - llvm-toolchain-precise-3.9

+    - os: linux
+      compiler: clang++-4.0
+      env: TOOLSET=clang COMPILER=clang++-4.0 CXXSTD=03,11,14,1z
+      addons:
+        apt:
+          packages:
+            - clang-4.0
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-4.0
+
    - os: linux
      compiler: clang++-4.0
      env: TOOLSET=clang COMPILER=clang++-4.0 CXXSTD=03,11,14,1z
@@ -207,6 +274,17 @@ matrix:
            - ubuntu-toolchain-r-test
            - llvm-toolchain-trusty-4.0

+    - os: linux
+      compiler: clang++-5.0
+      env: TOOLSET=clang COMPILER=clang++-5.0 CXXSTD=03,11,14,1z
+      addons:
+        apt:
+          packages:
+            - clang-5.0
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-5.0
+
    - os: linux
      compiler: clang++-5.0
      env: TOOLSET=clang COMPILER=clang++-5.0 CXXSTD=03,11,14,1z
@@ -231,6 +309,29 @@ matrix:
            - ubuntu-toolchain-r-test
            - llvm-toolchain-trusty-5.0

+    - os: linux
+      compiler: clang++-6.0
+      env: TOOLSET=clang COMPILER=clang++-6.0 CXXSTD=03,11,14,17
+      addons:
+        apt:
+          packages:
+            - clang-6.0
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-6.0
+
+    - os: linux
+      compiler: clang++-6.0
+      env: TOOLSET=clang COMPILER=clang++-6.0 CXXSTD=03,11,14,17
+      addons:
+        apt:
+          packages:
+            - clang-6.0
+            - libstdc++-4.9-dev
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-6.0
+
    - os: linux
      compiler: clang++-libc++
      env: TOOLSET=clang COMPILER=clang++-libc++ CXXSTD=03,11,14,1z
@@ -267,7 +368,7 @@ install:
 script:
  - |-
    echo "using $TOOLSET : : $COMPILER ;" > ~/user-config.jam
-  - ./b2 -j3 libs/system/test toolset=$TOOLSET cxxstd=$CXXSTD variant=debug,release ${UBSAN:+cxxflags=-fsanitize=undefined cxxflags=-fno-sanitize-recover=undefined linkflags=-fsanitize=undefined define=UBSAN=1 debug-symbols=on}
+  - ./b2 -j3 libs/system/test toolset=$TOOLSET cxxstd=$CXXSTD variant=debug,release ${UBSAN:+cxxflags=-fsanitize=undefined cxxflags=-fno-sanitize-recover=undefined linkflags=-fsanitize=undefined define=UBSAN=1 debug-symbols=on} ${LINKFLAGS:+linkflags=$LINKFLAGS}

 notifications:
  email:
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -36,6 +36,13 @@ environment:
      ADDPATH: C:\cygwin\bin;
      TOOLSET: gcc
      CXXSTD: 03,11
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
+      ADDPATH: C:\cygwin64\bin;
+      TOOLSET: gcc
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
+      ADDPATH: C:\cygwin64\bin;
+      TOOLSET: gcc
+      CXXSTD: 03,11
    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
      ADDPATH: C:\mingw\bin;
      TOOLSET: gcc
--- a/include/boost/system/error_code.hpp
+++ b/include/boost/system/error_code.hpp
@@ -43,11 +43,22 @@
 # define BOOST_SYSTEM_HAS_CONSTEXPR
 #endif

-#if defined(__GNUC__) && (__GNUC__ == 7 || __GNUC__ == 8) && __cplusplus >= 201700L
+#if defined(__GNUC__) && (__GNUC__ == 7 && __GNUC_MINOR__ < 4) && __cplusplus >= 201700L
 // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=83835
 #  undef BOOST_SYSTEM_HAS_CONSTEXPR
 #endif

+#if defined(__clang__) && defined(_MSC_VER) && defined(_CPPLIB_VER)
+// Clang on Windows with MSVC headers, the constructor of std::error_category
+// is not constexpr at least up to VS2017 15.7.x (_MSVC_STL_UPDATE 201803)
+#  undef BOOST_SYSTEM_HAS_CONSTEXPR
+#endif
+
+#if defined(__clang__) && defined(BOOST_LIBSTDCXX_VERSION) && BOOST_LIBSTDCXX_VERSION < 40900
+// The constructor of std::error_category is not constexpr in libstdc++ 4.8
+#  undef BOOST_SYSTEM_HAS_CONSTEXPR
+#endif
+
 #if defined(BOOST_SYSTEM_HAS_CONSTEXPR)
 # define BOOST_SYSTEM_CONSTEXPR constexpr
 #else
@@ -442,9 +453,19 @@ inline const error_category & generic_category() BOOST_SYSTEM_NOEXCEPT
 namespace detail
 {

+#if defined(BOOST_SYSTEM_SOURCE)
+
+// clang++ requires a strictly matching declaration
+BOOST_SYSTEM_DECL extern system_error_category system_category_instance;
+BOOST_SYSTEM_DECL extern generic_error_category generic_category_instance;
+
+#else
+
 extern system_error_category system_category_instance;
 extern generic_error_category generic_category_instance;

+#endif
+
 } // namespace detail

 constexpr const error_category & system_category() BOOST_SYSTEM_NOEXCEPT
--- a/include/boost/system/system_error.hpp
+++ b/include/boost/system/system_error.hpp
@@ -8,10 +8,10 @@
 #ifndef BOOST_SYSTEM_SYSTEM_ERROR_HPP
 #define BOOST_SYSTEM_SYSTEM_ERROR_HPP

+#include <boost/system/error_code.hpp>
 #include <string>
 #include <stdexcept>
 #include <cassert>
-#include <boost/system/error_code.hpp>

 namespace boost
 {
--- a/test/constexpr_test.cpp
+++ b/test/constexpr_test.cpp
@@ -32,7 +32,7 @@ BOOST_STATIC_ASSERT( e2.category() == generic_category() );
 BOOST_STATIC_ASSERT( e2 );
 BOOST_STATIC_ASSERT( e2 == e2 );

-#if !BOOST_WORKAROUND(BOOST_GCC, < 80000)
+#if !BOOST_WORKAROUND(BOOST_GCC, < 80200)

 BOOST_STATIC_ASSERT( e1 != e2 );

@@ -45,7 +45,7 @@ BOOST_STATIC_ASSERT( e3.category() == system_category() );
 BOOST_STATIC_ASSERT( !e3 );
 BOOST_STATIC_ASSERT( e3 == e3 );

-#if !BOOST_WORKAROUND(BOOST_GCC, < 80000)
+#if !BOOST_WORKAROUND(BOOST_GCC, < 80200)

 BOOST_STATIC_ASSERT( e1 != e3 );
Author	SHA1	Message	Date
Peter Dimov	13199e504c	Reorder includes to avoid ::gets error under Clang 3.8, 3.9	2018-07-19 19:48:20 +03:00
Peter Dimov	3c59cea7ef	Disable constexpr on Clang/libstdc++4.8	2018-07-19 19:04:53 +03:00
Peter Dimov	697c73ac57	Reorder Travis configurations	2018-07-19 19:00:14 +03:00
Peter Dimov	3afc9db9e6	Add Clang configurations using the default libstdc++ to Travis	2018-07-19 18:27:57 +03:00
Peter Dimov	e57cca107d	Disable constexpr on Clang/Win	2018-07-09 13:50:27 +03:00
Peter Dimov	9e039cfaf9	Fix dllexport mismatch errors under clang++	2018-06-29 05:39:42 +03:00
Peter Dimov	084d8e119e	Update g++ workaround to exclude 7.4/8.1	2018-06-29 03:56:56 +03:00
Peter Dimov	0d2aeead38	Update workarounds to cover g++ 8.1	2018-06-29 02:29:23 +03:00
Peter Dimov	73b2805d63	Add g++ 8, clang++ 6 to Travis	2018-06-29 00:42:31 +03:00
Peter Dimov	6a71483984	Work around `ld: unrecognized option '--push-state--no-as-needed'`	2018-05-04 15:47:28 +03:00
Peter Dimov	2b1aa524d9	Merge pull request #23 from boostorg/feature/constexpr Make error_code and error_condition constexpr, as proposed in https://cplusplus.github.io/LWG/issue2992	2018-05-04 15:06:41 +03:00
Peter Dimov	a9bb21507a	Add Cygwin 64 to Appveyor	2018-03-09 05:12:03 +02:00