Remove duplicate clang-3.6

Fix .travis.yml mistakes
Switch UBSAN from g++-8 to g++-9
2025-12-30 10:38:13 +01:00 · 2020-01-02 04:17:38 +02:00 · 2020-01-02 02:57:24 +02:00 · 2020-01-01 23:47:39 +02:00 · 2020-01-01 23:32:04 +02:00 · 2019-12-09 01:47:54 +02:00
4 changed files with 65 additions and 103 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,8 @@ language: cpp

 sudo: false

+dist: xenial
+
 branches:
  only:
    - master
@@ -116,12 +118,22 @@ matrix:
            - ubuntu-toolchain-r-test

    - os: linux
-      compiler: g++-8
-      env: UBSAN=1 TOOLSET=gcc COMPILER=g++-8 CXXSTD=03,11,14,17 UBSAN_OPTIONS=print_stacktrace=1 LINKFLAGS=-fuse-ld=gold
+      compiler: g++-9
+      env: TOOLSET=gcc COMPILER=g++-9 CXXSTD=03,11,14,17,2a
      addons:
        apt:
          packages:
-            - g++-8
+            - g++-9
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      compiler: g++-9
+      env: UBSAN=1 TOOLSET=gcc COMPILER=g++-9 CXXSTD=03,11,14,17,2a UBSAN_OPTIONS=print_stacktrace=1 LINKFLAGS=-fuse-ld=gold
+      addons:
+        apt:
+          packages:
+            - g++-9
          sources:
            - ubuntu-toolchain-r-test

@@ -130,6 +142,7 @@ matrix:
      env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11

    - os: linux
+      dist: trusty
      compiler: /usr/bin/clang++
      env: TOOLSET=clang COMPILER=/usr/bin/clang++ CXXSTD=03,11
      addons:
@@ -138,6 +151,7 @@ matrix:
            - clang-3.3

    - os: linux
+      dist: trusty
      compiler: /usr/bin/clang++
      env: TOOLSET=clang COMPILER=/usr/bin/clang++ CXXSTD=03,11
      addons:
@@ -146,16 +160,15 @@ matrix:
            - clang-3.4

    - os: linux
+      dist: trusty
      compiler: clang++-3.5
      env: TOOLSET=clang COMPILER=clang++-3.5 CXXSTD=03,11,14,1z
      addons:
        apt:
          packages:
            - clang-3.5
-            - libstdc++-4.9-dev
          sources:
            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.5

    - os: linux
      compiler: clang++-3.6
@@ -166,19 +179,6 @@ matrix:
            - clang-3.6
          sources:
            - 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
@@ -189,19 +189,6 @@ matrix:
            - clang-3.7
          sources:
            - 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
@@ -212,19 +199,6 @@ matrix:
            - 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
-      addons:
-        apt:
-          packages:
-            - clang-3.8
-            - libstdc++-4.9-dev
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.8

    - os: linux
      compiler: clang++-3.9
@@ -235,19 +209,6 @@ matrix:
            - 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
-      addons:
-        apt:
-          packages:
-            - clang-3.9
-            - libstdc++-4.9-dev
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.9

    - os: linux
      compiler: clang++-4.0
@@ -258,19 +219,6 @@ matrix:
            - 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
-      addons:
-        apt:
-          packages:
-            - clang-4.0
-            - libstdc++-4.9-dev
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty-4.0

    - os: linux
      compiler: clang++-5.0
@@ -281,19 +229,6 @@ matrix:
            - 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
-      addons:
-        apt:
-          packages:
-            - clang-5.0
-            - libstdc++-4.9-dev
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty-5.0

    - os: linux
      compiler: clang++-6.0
@@ -304,19 +239,6 @@ matrix:
            - 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++-7
@@ -327,21 +249,44 @@ matrix:
            - clang-7
          sources:
            - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty-7
+            - llvm-toolchain-xenial-7

    - os: linux
-      compiler: clang++-6.0
-      env: UBSAN=1 TOOLSET=clang COMPILER=clang++-6.0 CXXSTD=03,11,14,1z UBSAN_OPTIONS=print_stacktrace=1
+      compiler: clang++-8
+      env: TOOLSET=clang COMPILER=clang++-8 CXXSTD=03,11,14,17,2a
      addons:
        apt:
          packages:
-            - clang-6.0
-            - libstdc++-5-dev
+            - clang-8
          sources:
            - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty-6.0
+            - llvm-toolchain-xenial-8

    - os: linux
+      compiler: clang++-9
+      env: TOOLSET=clang COMPILER=clang++-9 CXXSTD=03,11,14,17,2a
+      addons:
+        apt:
+          packages:
+            - clang-9
+          sources:
+            - ubuntu-toolchain-r-test
+            - sourceline: 'deb https://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main'
+              key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
+
+    - os: linux
+      compiler: clang++-8
+      env: UBSAN=1 TOOLSET=clang COMPILER=clang++-8 CXXSTD=03,11,14,17,2a UBSAN_OPTIONS=print_stacktrace=1
+      addons:
+        apt:
+          packages:
+            - clang-8
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-xenial-8
+
+    - os: linux
+      dist: trusty
      compiler: clang++-libc++
      env: TOOLSET=clang COMPILER=clang++-libc++ CXXSTD=03,11,14,1z
      addons:
@@ -350,6 +295,7 @@ matrix:
            - libc++-dev

    - os: linux
+      dist: trusty
      compiler: clang++-libc++
      env: UBSAN=1 TOOLSET=clang COMPILER=clang++-libc++ CXXSTD=03,11,14,1z UBSAN_OPTIONS=print_stacktrace=1
      addons:
@@ -361,6 +307,10 @@ matrix:
      compiler: clang++
      env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z

+    - os: osx
+      compiler: clang++
+      env: UBSAN=1 TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z UBSAN_OPTIONS=print_stacktrace=1
+
    - os: linux
      compiler: g++
      env: CMAKE_SUBDIR_TEST=1
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -23,6 +23,14 @@ environment:
      TOOLSET: msvc-14.1
      CXXSTD: 14,17
      ADDRMD: 32,64
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      TOOLSET: clang-win
+      CXXSTD: 14,17
+      ADDRMD: 64
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      TOOLSET: msvc-14.2
+      CXXSTD: 14,17
+      ADDRMD: 32,64
    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
      ADDPATH: C:\cygwin\bin;
      TOOLSET: gcc
--- a/include/boost/system/detail/system_category_win32.hpp
+++ b/include/boost/system/detail/system_category_win32.hpp
@@ -264,6 +264,7 @@ inline error_condition system_category_default_error_condition_win32( int ev ) B
    case ERROR_CANTOPEN_: return make_error_condition( io_error );
    case ERROR_CANTREAD_: return make_error_condition( io_error );
    case ERROR_CANTWRITE_: return make_error_condition( io_error );
+    case ERROR_CONNECTION_ABORTED_: return make_error_condition( connection_aborted );
    case ERROR_CURRENT_DIRECTORY_: return make_error_condition( permission_denied );
    case ERROR_DEV_NOT_EXIST_: return make_error_condition( no_such_device );
    case ERROR_DEVICE_IN_USE_: return make_error_condition( device_or_resource_busy );
--- a/include/boost/system/error_code.hpp
+++ b/include/boost/system/error_code.hpp
@@ -335,8 +335,11 @@ template<class T> struct BOOST_SYMBOL_VISIBLE cat_holder
    static constexpr generic_error_category generic_category_instance{};
 };

+// Before C++17 it was mandatory to redeclare all static constexpr
+#if defined(BOOST_NO_CXX17_INLINE_VARIABLES)
 template<class T> constexpr system_error_category cat_holder<T>::system_category_instance;
 template<class T> constexpr generic_error_category cat_holder<T>::generic_category_instance;
+#endif

 } // namespace detail

@@ -784,7 +787,7 @@ inline std::size_t hash_value( error_code const & ec )

    if( id == 0 )
    {
-        id = reinterpret_cast<boost::ulong_long_type>( &cat );
+        id = reinterpret_cast<boost::uintptr_t>( &cat );
    }

    boost::ulong_long_type hv = ( boost::ulong_long_type( 0xCBF29CE4 ) << 32 ) + 0x84222325;
Author	SHA1	Message	Date
Peter Dimov	97665bf539	Remove duplicate clang-3.6	2020-01-02 04:17:38 +02:00
Peter Dimov	6d82346e0b	Fix .travis.yml mistakes	2020-01-02 02:57:24 +02:00
Peter Dimov	673dd13eaa	Switch UBSAN from g++-8 to g++-9	2020-01-01 23:47:39 +02:00
Peter Dimov	ca525cd7b2	Update Travis to Xenial	2020-01-01 23:32:04 +02:00
Peter Dimov	9fb5bbd448	Remove 32 bit configuration from clang-win on Appveyor to avoid mspdbcore.dll error	2019-12-09 01:47:54 +02:00
Peter Dimov	31152834ac	Add VS2019 to Appveyor; separate clang-win into its own job	2019-11-24 00:04:25 +02:00
Peter Dimov	455946faac	Merge pull request #49 from Thomas-Barbier-1A/cpp7_redundant_redeclar_constexpr Fix c++17 warning redundant redeclaration of 'constexpr' static data	2019-10-02 02:55:45 -07:00
Thomas Barbier	08370c9158	Fix c++17 warning redundant redeclaration of 'constexpr' static data member [-Werror=deprecated]	2019-10-01 18:49:31 +02:00
Peter Dimov	c556aba559	Remove redundant Travis job	2019-06-18 12:50:59 +03:00
Peter Dimov	ecc4ddd87c	Add gcc9, clang8 to Travis	2019-06-18 12:46:04 +03:00
Peter Dimov	f67827eee3	Add `dist: trusty` to .travis.yml	2019-06-18 01:08:17 +03:00
Peter Dimov	c08b8a94ea	Fix sign extension (warning 4826.) Closes #48 .	2019-05-24 18:55:27 +03:00
Peter Dimov	835e5de228	Add clang-win to Appveyor	2019-05-14 04:16:53 +03:00
Peter Dimov	dc2ad73e30	Merge pull request #47 from KABoissonneault/feature/issue_46 Added boost::winapi::ERROR_CONNECTION_ABORTED_ to handled error codes…	2019-05-13 18:14:54 -07:00
Kévin Alexandre Boissonneault	32a6c13533	Added boost::winapi::ERROR_CONNECTION_ABORTED_ to handled error codes in Win32's system_category, making it equivalent to errc::connection_aborted	2019-05-13 18:08:24 -04:00