Update and collapse Appveyor configurations

Remove noexcept from conversions to std::error_code/condition; they allocate and can throw
Merge branch 'feature/header-only' into feature/merge-header-only
2025-12-27 01:08:18 +01:00 · 2018-09-21 20:51:24 +03:00 · 2018-09-21 17:07:51 +03:00 · 2018-09-19 14:05:33 +03:00 · 2018-09-18 22:32:42 +03:00 · 2018-09-18 22:32:26 +03:00
2 changed files with 13 additions and 30 deletions
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-# Copyright 2016, 2017 Peter Dimov
+# Copyright 2016-2018 Peter Dimov
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)

@@ -15,48 +15,30 @@ branches:
 environment:
  matrix:
    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-      TOOLSET: msvc-9.0
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-      TOOLSET: msvc-10.0
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-      TOOLSET: msvc-11.0
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-      TOOLSET: msvc-12.0
+      TOOLSET: msvc-9.0,msvc-10.0,msvc-11.0,msvc-12.0
    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
      TOOLSET: msvc-14.0
+      ADDRMD: 32,64
    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
      TOOLSET: msvc-14.1
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      TOOLSET: msvc-14.1
-      CXXSTD: 17
+      CXXSTD: 14,17
+      ADDRMD: 32,64
    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
      ADDPATH: C:\cygwin\bin;
      TOOLSET: gcc
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-      ADDPATH: C:\cygwin\bin;
-      TOOLSET: gcc
-      CXXSTD: 03,11
+      CXXSTD: 03,11,14,1z
    - 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
+      CXXSTD: 03,11,14,1z
    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
      ADDPATH: C:\mingw\bin;
      TOOLSET: gcc
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-      ADDPATH: C:\mingw\bin;
-      TOOLSET: gcc
-      CXXSTD: 03,11
+      CXXSTD: 03,11,14,1z
    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
      ADDPATH: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;
      TOOLSET: gcc
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-      ADDPATH: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;
-      TOOLSET: gcc
-      CXXSTD: 03,11
+      CXXSTD: 03,11,14,1z

 install:
  - set BOOST_BRANCH=develop
@@ -77,4 +59,5 @@ build: off
 test_script:
  - PATH=%ADDPATH%%PATH%
  - if not "%CXXSTD%" == "" set CXXSTD=cxxstd=%CXXSTD%
-  - b2 -j3 libs/system/test toolset=%TOOLSET% variant=debug,release %CXXSTD%
+  - if not "%ADDRMD%" == "" set ADDRMD=address-model=%ADDRMD%
+  - b2 -j3 libs/system/test toolset=%TOOLSET% %CXXSTD% %ADDRMD% variant=debug,release
--- a/include/boost/system/error_code.hpp
+++ b/include/boost/system/error_code.hpp
@@ -483,7 +483,7 @@ public:

 #if defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)

-    operator std::error_condition () const BOOST_NOEXCEPT
+    operator std::error_condition () const
    {
        return std::error_condition( value(), category() );
    }
@@ -610,7 +610,7 @@ public:

 #if defined(BOOST_SYSTEM_HAS_SYSTEM_ERROR)

-    operator std::error_code () const BOOST_NOEXCEPT
+    operator std::error_code () const
    {
        return std::error_code( value(), category() );
    }
Author	SHA1	Message	Date
Peter Dimov	d966de437e	Update and collapse Appveyor configurations	2018-09-21 20:51:24 +03:00
Peter Dimov	d79e38e5d5	Remove noexcept from conversions to std::error_code/condition; they allocate and can throw	2018-09-21 17:07:51 +03:00
Peter Dimov	a4e700ecf4	Merge branch 'feature/header-only' into feature/merge-header-only	2018-09-19 14:05:33 +03:00
Peter Dimov	70d16a61e6	Merge branch 'feature/header-only' into feature/merge-header-only	2018-09-18 22:32:42 +03:00
Peter Dimov	3a41aaabad	Revert "MSVC requires __declspec(dllimport) for variables" This reverts commit `4b7018de85`.	2018-09-18 22:32:26 +03:00
Peter Dimov	46d383b3bd	Revert "Disable constexpr on msvc-14.1" This reverts commit `3bdea5dfa3`.	2018-09-18 22:30:56 +03:00
Peter Dimov	9afd678532	Revert "Add BOOST_SYMBOL_VISIBLE to generic_error_category and system_error_category, to placate ubsan" This reverts commit `a9909bb82b`.	2018-09-18 22:30:54 +03:00
Peter Dimov	68c89304f2	Revert "Sprinkle more BOOST_SYMBOL_VISIBLE throughout" This reverts commit `bbd0a3766d`.	2018-09-18 22:30:52 +03:00
Peter Dimov	0272ea0ea5	Revert "Revert "Use enable_if from type_traits"" This reverts commit `ca68b08511`.	2018-09-18 22:30:50 +03:00
Peter Dimov	c4626e0413	Revert "Normalize Core includes" This reverts commit `ff7116404b`.	2018-09-18 22:30:40 +03:00
Peter Dimov	ff7116404b	Normalize Core includes	2018-09-17 02:47:34 +03:00
Peter Dimov	ca68b08511	Revert "Use enable_if from type_traits" This reverts commit `f92c0fc9b7`.	2018-09-17 02:39:32 +03:00
Peter Dimov	bbd0a3766d	Sprinkle more BOOST_SYMBOL_VISIBLE throughout	2018-09-16 13:53:11 +03:00
Peter Dimov	a9909bb82b	Add BOOST_SYMBOL_VISIBLE to generic_error_category and system_error_category, to placate ubsan	2018-09-16 08:00:24 +03:00
Peter Dimov	3bdea5dfa3	Disable constexpr on msvc-14.1	2018-09-16 04:49:59 +03:00
Peter Dimov	02ea086173	Fix throw_test.cpp to not meddle with BOOST_SYSTEM_SOURCE as it needs to import from Boost.System while exporting throw_test()	2018-09-16 04:32:33 +03:00
Peter Dimov	4b7018de85	MSVC requires __declspec(dllimport) for variables	2018-09-16 04:23:37 +03:00