Update appveyor.yml

build/Jamfile.v2

@@ -180,5 +180,4 @@ lib boost_stacktrace_from_exception
   : # usage-requirements
     #<link>shared:<define>BOOST_STACKTRACE_DYN_LINK=1
     <define>BOOST_STACKTRACE_NO_LIB=1
-    <define>BOOST_STACKTRACE_LINKED_WITH_FROM_EXCEPTION=1
   ;

include/boost/stacktrace/stacktrace.hpp

@@ -37,18 +37,12 @@
 
 extern "C" {
 
+BOOST_SYMBOL_EXPORT inline void* boost_stacktrace_impl_return_nullptr() { return nullptr; }
 const char* boost_stacktrace_impl_current_exception_stacktrace();
 bool* boost_stacktrace_impl_ref_capture_stacktraces_at_throw();
 
 }
 
-#ifndef BOOST_STACKTRACE_LINKED_WITH_FROM_EXCEPTION
-
-extern "C" {
-BOOST_SYMBOL_EXPORT
-inline void* boost_stacktrace_impl_return_nullptr() { return nullptr; }
-}
-
 #ifdef _M_IX86
 #   pragma comment(linker, "/ALTERNATENAME:_boost_stacktrace_impl_current_exception_stacktrace=_boost_stacktrace_impl_return_nullptr")
 #   pragma comment(linker, "/ALTERNATENAME:_boost_stacktrace_impl_ref_capture_stacktraces_at_throw=_boost_stacktrace_impl_return_nullptr")
@@ -57,8 +51,6 @@ inline void* boost_stacktrace_impl_return_nullptr() { return nullptr; }
 #   pragma comment(linker, "/ALTERNATENAME:boost_stacktrace_impl_ref_capture_stacktraces_at_throw=boost_stacktrace_impl_return_nullptr")
 #endif
 
-#endif  // #ifndef BOOST_STACKTRACE_LINKED_WITH_FROM_EXCEPTION
-
 #endif
 
 namespace boost { namespace stacktrace {

test/appveyor.yml

@@ -36,23 +36,23 @@ environment:
       TOOLSET: msvc-14.1 #,clang-win
       CXXSTD: 14,17
       ADDRMD: 64
-    #- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-    #  ADDPATH: C:\cygwin\bin;
-    #  TOOLSET: gcc
-    #  CXXSTD: 03,11,14,1z
-    #- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-    #  ADDPATH: C:\cygwin64\bin;
-    #  TOOLSET: gcc
-    #  CXXSTD: 03,11,14,1z
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      ADDPATH: C:\cygwin\bin;
+      TOOLSET: gcc
+      CXXSTD: 11,14,1z
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      ADDPATH: C:\cygwin64\bin;
+      TOOLSET: gcc
+      CXXSTD: 11,14,1z
     # Waiting for https://github.com/boostorg/system/issues/116
-    #- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-    #  ADDPATH: C:\mingw\bin;
-    #  TOOLSET: gcc
-    #  CXXSTD: 03,11,14,1z
-    #- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-    #  ADDPATH: C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin;
-    #  TOOLSET: gcc
-    #  CXXSTD: 03,11,14,1z
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      ADDPATH: C:\mingw\bin;
+      TOOLSET: gcc
+      CXXSTD: 11,14,1z
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      ADDPATH: C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin;
+      TOOLSET: gcc
+      CXXSTD: 03,11,14,1z
 
 before_build:
     - set BOOST_BRANCH=develop