Mark throw_exception with BOOST_NORETURN. Closes #12 .

Switch Appveyor to 2015 image
Remove essentials from yml files
2019-06-03 03:06:40 +03:00 · 2019-04-14 17:51:51 +03:00 · 2018-12-22 05:16:16 +02:00 · 2018-12-18 21:58:55 +02:00 · 2018-09-30 04:07:21 +03:00 · 2018-09-30 04:05:46 +03:00
18 changed files with 852 additions and 113 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -0,0 +1,290 @@
+# 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)
+
+language: cpp
+
+sudo: false
+
+python: "2.7"
+
+branches:
+  only:
+    - master
+    - develop
+    - /feature\/.*/
+
+env:
+  matrix:
+    - BOGUS_JOB=true
+
+matrix:
+
+  exclude:
+    - env: BOGUS_JOB=true
+
+  include:
+    - os: linux
+      compiler: g++
+      env: TOOLSET=gcc COMPILER=g++ CXXSTD=03,11
+
+    - os: linux
+      compiler: g++-4.4
+      env: TOOLSET=gcc COMPILER=g++-4.4 CXXSTD=98,0x
+      addons:
+        apt:
+          packages:
+            - g++-4.4
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      compiler: g++-4.6
+      env: TOOLSET=gcc COMPILER=g++-4.6 CXXSTD=03,0x
+      addons:
+        apt:
+          packages:
+            - g++-4.6
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      compiler: g++-4.7
+      env: TOOLSET=gcc COMPILER=g++-4.7 CXXSTD=03,11
+      addons:
+        apt:
+          packages:
+            - g++-4.7
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      compiler: g++-4.8
+      env: TOOLSET=gcc COMPILER=g++-4.8 CXXSTD=03,11
+      addons:
+        apt:
+          packages:
+            - g++-4.8
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      compiler: g++-4.9
+      env: TOOLSET=gcc COMPILER=g++-4.9 CXXSTD=03,11
+      addons:
+        apt:
+          packages:
+            - g++-4.9
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      compiler: g++-5
+      env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=03,11,14,1z
+      addons:
+        apt:
+          packages:
+            - g++-5
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      compiler: g++-6
+      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=03,11,14,1z
+      addons:
+        apt:
+          packages:
+            - g++-6
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      compiler: g++-7
+      env: TOOLSET=gcc COMPILER=g++-7 CXXSTD=03,11,14,17
+      addons:
+        apt:
+          packages:
+            - g++-7
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      compiler: g++-8
+      env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=03,11,14,17,2a
+      addons:
+        apt:
+          packages:
+            - g++-8
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      compiler: g++-8
+      env: UBSAN=1 TOOLSET=gcc COMPILER=g++-8 CXXSTD=03,11,14,17,2a UBSAN_OPTIONS=print_stacktrace=1 LINKFLAGS=-fuse-ld=gold
+      addons:
+        apt:
+          packages:
+            - g++-8
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      compiler: clang++
+      env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11
+
+    - os: linux
+      compiler: /usr/bin/clang++
+      env: TOOLSET=clang COMPILER=/usr/bin/clang++ CXXSTD=03,11
+      addons:
+        apt:
+          packages:
+            - clang-3.3
+
+    - os: linux
+      compiler: /usr/bin/clang++
+      env: TOOLSET=clang COMPILER=/usr/bin/clang++ CXXSTD=03,11
+      addons:
+        apt:
+          packages:
+            - clang-3.4
+
+    - os: linux
+      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
+
+    - 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
+
+    - 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
+
+    - 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
+
+    - 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
+      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
+      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++-7
+      env: TOOLSET=clang COMPILER=clang++-7 CXXSTD=03,11,14,17,2a
+      addons:
+        apt:
+          packages:
+            - clang-7
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-7
+
+    - os: linux
+      compiler: clang++-6.0
+      env: UBSAN=1 TOOLSET=clang COMPILER=clang++-6.0 CXXSTD=03,11,14,17 UBSAN_OPTIONS=print_stacktrace=1
+      addons:
+        apt:
+          packages:
+            - clang-6.0
+          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
+      addons:
+        apt:
+          packages:
+            - libc++-dev
+
+    - os: linux
+      compiler: clang++-libc++
+      env: UBSAN=1 TOOLSET=clang COMPILER=clang++-libc++ CXXSTD=03,11,14,1z UBSAN_OPTIONS=print_stacktrace=1
+      addons:
+        apt:
+          packages:
+            - libc++-dev
+
+    - os: osx
+      compiler: clang++
+      env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z
+
+install:
+  - BOOST_BRANCH=develop && [ "$TRAVIS_BRANCH" == "master" ] && BOOST_BRANCH=master || true
+  - cd ..
+  - git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
+  - cd boost-root
+  - git submodule update --init tools/boostdep
+  - cp -r $TRAVIS_BUILD_DIR/* libs/throw_exception
+  - python tools/boostdep/depinst/depinst.py throw_exception
+  - ./bootstrap.sh
+  - ./b2 headers
+
+script:
+  - |-
+    echo "using $TOOLSET : : $COMPILER ;" > ~/user-config.jam
+  - ./b2 -j 3 libs/throw_exception/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:
+    on_success: always
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -0,0 +1,20 @@
+# Copyright 2018 Mike Dev
+# Distributed under the Boost Software License, Version 1.0.
+# See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt
+
+# Partial (add_subdirectory only) and experimental CMake support
+# Subject to change; please do not rely on the contents of this file yet
+
+cmake_minimum_required(VERSION 3.5)
+project(BoostThrowException LANGUAGES CXX)
+
+add_library(boost_throw_exception INTERFACE)
+add_library(Boost::throw_exception ALIAS boost_throw_exception)
+
+target_include_directories(boost_throw_exception INTERFACE include)
+
+target_link_libraries(boost_throw_exception
+    INTERFACE
+        Boost::assert
+        Boost::config
+)
--- a/appveyor.yml
+++ b/appveyor.yml
@ -0,0 +1,56 @@
+# Copyright 2016-2019 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)
+
+version: 1.0.{build}-{branch}
+
+shallow_clone: true
+
+branches:
+  only:
+    - master
+    - develop
+    - /feature\/.*/
+
+environment:
+  matrix:
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      TOOLSET: msvc-9.0,msvc-10.0,msvc-11.0,msvc-12.0,msvc-14.0
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      TOOLSET: msvc-14.1
+      CXXSTD: 14,17
+    - 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:\mingw\bin;
+      TOOLSET: gcc
+      CXXSTD: 03,11,14,1z
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      ADDPATH: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;
+      TOOLSET: gcc
+      CXXSTD: 03,11,14,1z
+
+install:
+  - set BOOST_BRANCH=develop
+  - if "%APPVEYOR_REPO_BRANCH%" == "master" set BOOST_BRANCH=master
+  - cd ..
+  - git clone -b %BOOST_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root
+  - cd boost-root
+  - git submodule update --init tools/boostdep
+  - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\throw_exception\
+  - python tools/boostdep/depinst/depinst.py throw_exception
+  - cmd /c bootstrap
+  - b2 -d0 headers
+
+build: off
+
+test_script:
+  - PATH=%ADDPATH%%PATH%
+  - if not "%CXXSTD%" == "" set CXXSTD=cxxstd=%CXXSTD%
+  - b2 -j3 libs/throw_exception/test toolset=%TOOLSET% %CXXSTD%
--- a/include/boost/exception/exception.hpp
+++ b/include/boost/exception/exception.hpp
@ -5,21 +5,24 @@

 #ifndef UUID_274DA366004E11DCB1DDFE2E56D89593
 #define UUID_274DA366004E11DCB1DDFE2E56D89593
-#if (__GNUC__*100+__GNUC_MINOR__>301) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS)
-#pragma GCC system_header
-#endif
-#if defined(_MSC_VER) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS)
-#pragma warning(push,1)
-#endif
+
+#include <boost/config.hpp>

 #ifdef BOOST_EXCEPTION_MINI_BOOST
 #include  <memory>
 namespace boost { namespace exception_detail { using std::shared_ptr; } }
 #else
-namespace boost { template <class T> class shared_ptr; };
+namespace boost { template <class T> class shared_ptr; }
 namespace boost { namespace exception_detail { using boost::shared_ptr; } }
 #endif

+#if defined(__GNUC__) && (__GNUC__*100+__GNUC_MINOR__>301) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS)
+#pragma GCC system_header
+#endif
+#if defined(_MSC_VER) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS)
+#pragma warning(push,1)
+#endif
+
 namespace
 boost
    {
@ -140,17 +143,9 @@ boost
            }
        };

-#if defined(__GNUC__)
-# if (__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || (__GNUC__ > 4)
-#  pragma GCC visibility push (default)
-# endif
-#endif
-    class exception;
-#if defined(__GNUC__)
-# if (__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || (__GNUC__ > 4)
-#  pragma GCC visibility pop
-# endif
-#endif
+    class
+    BOOST_SYMBOL_VISIBLE
+    exception;

    namespace
    exception_detail
@ -216,12 +211,8 @@ boost
        E const & set_info( E const &, throw_line const & );
        }

-#if defined(__GNUC__)
-# if (__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || (__GNUC__ > 4)
-#  pragma GCC visibility push (default)
-# endif
-#endif
    class
+    BOOST_SYMBOL_VISIBLE
    exception
        {
        //<N3757>
@ -293,11 +284,6 @@ boost
        mutable char const * throw_file_;
        mutable int throw_line_;
        };
-#if defined(__GNUC__)
-# if (__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || (__GNUC__ > 4)
-#  pragma GCC visibility pop
-# endif
-#endif

    inline
    exception::
@ -338,13 +324,9 @@ boost
    namespace
    exception_detail
        {
-#if defined(__GNUC__)
-# if (__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || (__GNUC__ > 4)
-#  pragma GCC visibility push (default)
-# endif
-#endif
        template <class T>
        struct
+        BOOST_SYMBOL_VISIBLE
        error_info_injector:
            public T,
            public exception
@ -359,11 +341,6 @@ boost
                {
                }
            };
-#if defined(__GNUC__)
-# if (__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || (__GNUC__ > 4)
-#  pragma GCC visibility pop
-# endif
-#endif

        struct large_size { char c[256]; };
        large_size dispatch_boost_exception( exception const * );
@ -411,12 +388,8 @@ boost
    namespace
    exception_detail
        {
-#if defined(__GNUC__)
-# if (__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || (__GNUC__ > 4)
-#  pragma GCC visibility push (default)
-# endif
-#endif
        class
+        BOOST_SYMBOL_VISIBLE
        clone_base
            {
            public:
@ -429,11 +402,6 @@ boost
                {
                }
            };
-#if defined(__GNUC__)
-# if (__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || (__GNUC__ > 4)
-#  pragma GCC visibility pop
-# endif
-#endif

        inline
        void
@ -454,13 +422,9 @@ boost
            {
            }

-#if defined(__GNUC__)
-# if (__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || (__GNUC__ > 4)
-#  pragma GCC visibility push (default)
-# endif
-#endif
        template <class T>
        class
+        BOOST_SYMBOL_VISIBLE
        clone_impl:
            public T,
            public virtual clone_base
@ -500,11 +464,6 @@ boost
                }
            };
        }
-#if defined(__GNUC__)
-# if (__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || (__GNUC__ > 4)
-#  pragma GCC visibility pop
-# endif
-#endif

    template <class T>
    inline
@ -513,6 +472,51 @@ boost
        {
        return exception_detail::clone_impl<T>(x);
        }
+
+    template <class T>
+    struct
+    BOOST_SYMBOL_VISIBLE
+    wrapexcept:
+        public exception_detail::clone_impl<typename exception_detail::enable_error_info_return_type<T>::type>
+        {
+        typedef exception_detail::clone_impl<typename exception_detail::enable_error_info_return_type<T>::type> base_type;
+        public:
+        explicit
+        wrapexcept( typename exception_detail::enable_error_info_return_type<T>::type const & x ):
+            base_type( x )
+            {
+            }
+
+        ~wrapexcept() throw()
+            {
+            }
+        };
+
+    namespace
+    exception_detail
+        {
+        template <class T>
+        struct
+        remove_error_info_injector
+            {
+            typedef T type;
+            };
+
+        template <class T>
+        struct
+        remove_error_info_injector< error_info_injector<T> >
+            {
+            typedef T type;
+            };
+
+        template <class T>
+        inline
+        wrapexcept<typename remove_error_info_injector<T>::type>
+        enable_both( T const & x )
+            {
+            return wrapexcept<typename remove_error_info_injector<T>::type>( enable_error_info( x ) );
+            }
+        }
    }

 #if defined(_MSC_VER) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS)
--- a/include/boost/throw_exception.hpp
+++ b/include/boost/throw_exception.hpp
@ -1,15 +1,6 @@
 #ifndef UUID_AA15E74A856F11E08B8D93F24824019B
 #define UUID_AA15E74A856F11E08B8D93F24824019B

-#include <boost/config.hpp>
-
-#if (__GNUC__*100+__GNUC_MINOR__>301) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS)
-#pragma GCC system_header
-#endif
-#if defined(_MSC_VER) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS)
-#pragma warning(push,1)
-#endif
-
 // MS compatible compilers support #pragma once

 #if defined(_MSC_VER) && (_MSC_VER >= 1020)
@ -29,6 +20,7 @@
 //  http://www.boost.org/libs/utility/throw_exception.html
 //

+#include <boost/config.hpp>
 #include <boost/detail/workaround.hpp>
 #include <exception>

@ -51,11 +43,18 @@
 # define BOOST_THROW_EXCEPTION(x) ::boost::throw_exception(x)
 #endif

+#if defined(__GNUC__) && (__GNUC__*100+__GNUC_MINOR__>301) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS)
+#pragma GCC system_header
+#endif
+#if defined(_MSC_VER) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS)
+#pragma warning(push,1)
+#endif
+
 namespace boost
 {
 #ifdef BOOST_NO_EXCEPTIONS

-void throw_exception( std::exception const & e ); // user defined
+BOOST_NORETURN void throw_exception( std::exception const & e ); // user defined

 #else

@ -68,7 +67,7 @@ template<class E> BOOST_NORETURN inline void throw_exception( E const & e )
    throw_exception_assert_compatibility(e);

 #ifndef BOOST_EXCEPTION_DISABLE
-    throw enable_current_exception(enable_error_info(e));
+    throw exception_detail::enable_both( e );
 #else
    throw e;
 #endif
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@ -7,15 +7,20 @@

 import testing ;

-project
-    : requirements
-        <link>static
-        <exception-handling>on
-    ;
-
 run throw_exception_test.cpp ;
 run throw_exception_no_exceptions_test.cpp ;
 run throw_exception_no_integration_test.cpp ;
 run throw_exception_no_both_test.cpp ;

 compile-fail throw_exception_fail.cpp ;
+
+run throw_exception_test2.cpp ;
+run throw_exception_test3.cpp ;
+run throw_exception_test4.cpp ;
+
+lib lib1_throw : lib1_throw.cpp : <define>LIB1_SOURCE=1 <link>shared:<define>LIB1_DYN_LINK=1 : : <link>shared:<define>LIB1_DYN_LINK=1 ;
+lib lib2_throw : lib2_throw.cpp : <define>LIB2_SOURCE=1 <link>shared:<define>LIB2_DYN_LINK=1 : : <link>shared:<define>LIB2_DYN_LINK=1 ;
+lib lib3_throw : lib3_throw.cpp : <define>LIB3_SOURCE=1 <link>shared:<define>LIB3_DYN_LINK=1 : : <link>shared:<define>LIB3_DYN_LINK=1 ;
+
+run throw_from_library_test.cpp lib1_throw lib2_throw lib3_throw : : : <link>static : throw_from_library_static ;
+run throw_from_library_test.cpp lib1_throw lib2_throw lib3_throw : : : <link>shared : throw_from_library_shared ;
--- a/test/lib1_throw.cpp
+++ b/test/lib1_throw.cpp
@ -0,0 +1,13 @@
+// Copyright 2018 Peter Dimov
+//
+// Distributed under the Boost Software License, Version 1.0.
+//
+// See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt
+
+#include "lib1_throw.hpp"
+
+void lib1::f()
+{
+    throw lib1::exception();
+}
--- a/test/lib1_throw.hpp
+++ b/test/lib1_throw.hpp
@ -0,0 +1,35 @@
+#ifndef LIB1_THROW_HPP_INCLUDED
+#define LIB1_THROW_HPP_INCLUDED
+
+// Copyright 2018 Peter Dimov
+//
+// Distributed under the Boost Software License, Version 1.0.
+//
+// See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt
+
+#include <boost/config.hpp>
+#include <exception>
+
+#if defined(LIB1_DYN_LINK)
+# if defined(LIB1_SOURCE)
+#  define LIB1_DECL BOOST_SYMBOL_EXPORT
+# else
+#  define LIB1_DECL BOOST_SYMBOL_IMPORT
+# endif
+#else
+# define LIB1_DECL
+#endif
+
+namespace lib1
+{
+
+struct BOOST_SYMBOL_VISIBLE exception: public std::exception
+{
+};
+
+LIB1_DECL void f();
+
+} // namespace lib1
+
+#endif // #ifndef LIB1_THROW_HPP_INCLUDED
--- a/test/lib2_throw.cpp
+++ b/test/lib2_throw.cpp
@ -0,0 +1,14 @@
+// Copyright 2018 Peter Dimov
+//
+// Distributed under the Boost Software License, Version 1.0.
+//
+// See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt
+
+#include "lib2_throw.hpp"
+#include <boost/throw_exception.hpp>
+
+void lib2::f()
+{
+    boost::throw_exception( lib2::exception() );
+}
--- a/test/lib2_throw.hpp
+++ b/test/lib2_throw.hpp
@ -0,0 +1,35 @@
+#ifndef LIB2_THROW_HPP_INCLUDED
+#define LIB2_THROW_HPP_INCLUDED
+
+// Copyright 2018 Peter Dimov
+//
+// Distributed under the Boost Software License, Version 1.0.
+//
+// See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt
+
+#include <boost/config.hpp>
+#include <exception>
+
+#if defined(LIB2_DYN_LINK)
+# if defined(LIB2_SOURCE)
+#  define LIB2_DECL BOOST_SYMBOL_EXPORT
+# else
+#  define LIB2_DECL BOOST_SYMBOL_IMPORT
+# endif
+#else
+# define LIB2_DECL
+#endif
+
+namespace lib2
+{
+
+struct BOOST_SYMBOL_VISIBLE exception: public std::exception
+{
+};
+
+LIB2_DECL void f();
+
+} // namespace lib2
+
+#endif // #ifndef LIB2_THROW_HPP_INCLUDED
--- a/test/lib3_throw.cpp
+++ b/test/lib3_throw.cpp
@ -0,0 +1,14 @@
+// Copyright 2018 Peter Dimov
+//
+// Distributed under the Boost Software License, Version 1.0.
+//
+// See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt
+
+#include "lib3_throw.hpp"
+#include <boost/throw_exception.hpp>
+
+void lib3::f()
+{
+    BOOST_THROW_EXCEPTION( lib3::exception() );
+}
--- a/test/lib3_throw.hpp
+++ b/test/lib3_throw.hpp
@ -0,0 +1,35 @@
+#ifndef LIB3_THROW_HPP_INCLUDED
+#define LIB3_THROW_HPP_INCLUDED
+
+// Copyright 2018 Peter Dimov
+//
+// Distributed under the Boost Software License, Version 1.0.
+//
+// See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt
+
+#include <boost/config.hpp>
+#include <exception>
+
+#if defined(LIB3_DYN_LINK)
+# if defined(LIB3_SOURCE)
+#  define LIB3_DECL BOOST_SYMBOL_EXPORT
+# else
+#  define LIB3_DECL BOOST_SYMBOL_IMPORT
+# endif
+#else
+# define LIB3_DECL
+#endif
+
+namespace lib3
+{
+
+struct BOOST_SYMBOL_VISIBLE exception: public std::exception
+{
+};
+
+LIB3_DECL void f();
+
+} // namespace lib3
+
+#endif // #ifndef LIB3_THROW_HPP_INCLUDED
--- a/test/throw_exception_no_both_test.cpp
+++ b/test/throw_exception_no_both_test.cpp
@ -5,27 +5,24 @@

 #define BOOST_NO_EXCEPTIONS
 #define BOOST_EXCEPTION_DISABLE
+
 #include <boost/throw_exception.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <cstdlib>

-class my_exception: public std::exception { };
+class my_exception: public std::exception {};

-bool called=false;
+int main()
+{
+    boost::throw_exception( my_exception() );
+    return 1;
+}

-namespace
-boost
-    {
-    void
-    throw_exception( std::exception const & )
-        {
-        called=true;
-        }
-    }
+namespace boost
+{

-int
-main()
-    {
-    boost::throw_exception(my_exception());
-    BOOST_TEST(called);
-    return boost::report_errors();
-    }
+void throw_exception( std::exception const & )
+{
+    std::exit( 0 );
+}
+
+} // namespace boost
--- a/test/throw_exception_no_exceptions_test.cpp
+++ b/test/throw_exception_no_exceptions_test.cpp
@ -4,27 +4,24 @@
 //file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

 #define BOOST_NO_EXCEPTIONS
+
 #include <boost/throw_exception.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <cstdlib>

-class my_exception: public std::exception { };
+class my_exception: public std::exception {};

-bool called=false;
+int main()
+{
+    boost::throw_exception( my_exception() );
+    return 1;
+}

-namespace
-boost
-    {
-    void
-    throw_exception( std::exception const & )
-        {
-        called=true;
-        }
-    }
+namespace boost
+{

-int
-main()
-    {
-    boost::throw_exception(my_exception());
-    BOOST_TEST(called);
-    return boost::report_errors();
-    }
+void throw_exception( std::exception const & )
+{
+    std::exit( 0 );
+}
+
+} // namespace boost
--- a/test/throw_exception_test2.cpp
+++ b/test/throw_exception_test2.cpp
@ -0,0 +1,28 @@
+// Copyright 2018 Peter Dimov
+//
+// Distributed under the Boost Software License, Version 1.0.
+//
+// See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt
+
+#include <boost/throw_exception.hpp>
+#include <boost/detail/lightweight_test.hpp>
+
+class my_exception: public std::exception
+{
+};
+
+class my_exception2: public std::exception, public boost::exception
+{
+};
+
+int main()
+{
+    BOOST_TEST_THROWS( boost::throw_exception( my_exception() ), boost::exception );
+    BOOST_TEST_THROWS( boost::throw_exception( my_exception2() ), boost::exception );
+
+    BOOST_TEST_THROWS( BOOST_THROW_EXCEPTION( my_exception() ), boost::exception );
+    BOOST_TEST_THROWS( BOOST_THROW_EXCEPTION( my_exception2() ), boost::exception );
+
+    return boost::report_errors();
+}
--- a/test/throw_exception_test3.cpp
+++ b/test/throw_exception_test3.cpp
@ -0,0 +1,71 @@
+// Copyright 2018 Peter Dimov
+//
+// Distributed under the Boost Software License, Version 1.0.
+//
+// See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt
+
+#include <boost/throw_exception.hpp>
+#include <boost/exception_ptr.hpp>
+#include <boost/detail/lightweight_test.hpp>
+
+class my_exception: public std::exception
+{
+};
+
+class my_exception2: public std::exception, public boost::exception
+{
+};
+
+int main()
+{
+    try
+    {
+        boost::throw_exception( my_exception() );
+    }
+    catch( ... )
+    {
+        boost::exception_ptr p = boost::current_exception();
+
+        BOOST_TEST_THROWS( boost::rethrow_exception( p ), my_exception );
+        BOOST_TEST_THROWS( boost::rethrow_exception( p ), boost::exception );
+    }
+
+    try
+    {
+        boost::throw_exception( my_exception2() );
+    }
+    catch( ... )
+    {
+        boost::exception_ptr p = boost::current_exception();
+
+        BOOST_TEST_THROWS( boost::rethrow_exception( p ), my_exception2 );
+        BOOST_TEST_THROWS( boost::rethrow_exception( p ), boost::exception );
+    }
+
+    try
+    {
+        BOOST_THROW_EXCEPTION( my_exception() );
+    }
+    catch( ... )
+    {
+        boost::exception_ptr p = boost::current_exception();
+
+        BOOST_TEST_THROWS( boost::rethrow_exception( p ), my_exception );
+        BOOST_TEST_THROWS( boost::rethrow_exception( p ), boost::exception );
+    }
+
+    try
+    {
+        BOOST_THROW_EXCEPTION( my_exception2() );
+    }
+    catch( ... )
+    {
+        boost::exception_ptr p = boost::current_exception();
+
+        BOOST_TEST_THROWS( boost::rethrow_exception( p ), my_exception2 );
+        BOOST_TEST_THROWS( boost::rethrow_exception( p ), boost::exception );
+    }
+
+    return boost::report_errors();
+}
--- a/test/throw_exception_test4.cpp
+++ b/test/throw_exception_test4.cpp
@ -0,0 +1,47 @@
+// Copyright 2018 Peter Dimov
+//
+// Distributed under the Boost Software License, Version 1.0.
+//
+// See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt
+
+#include <boost/throw_exception.hpp>
+#include <boost/exception/get_error_info.hpp>
+#include <boost/detail/lightweight_test.hpp>
+
+class my_exception: public std::exception
+{
+};
+
+class my_exception2: public std::exception, public boost::exception
+{
+};
+
+int main()
+{
+    try
+    {
+        BOOST_THROW_EXCEPTION( my_exception() );
+    }
+    catch( boost::exception const & x )
+    {
+        int const * line = boost::get_error_info<boost::throw_line>( x );
+
+        BOOST_TEST( line != 0 );
+        BOOST_TEST_EQ( *line, 24 );
+    }
+
+    try
+    {
+        BOOST_THROW_EXCEPTION( my_exception2() );
+    }
+    catch( boost::exception const & x )
+    {
+        int const * line = boost::get_error_info<boost::throw_line>( x );
+
+        BOOST_TEST( line != 0 );
+        BOOST_TEST_EQ( *line, 36 );
+    }
+
+    return boost::report_errors();
+}
--- a/test/throw_from_library_test.cpp
+++ b/test/throw_from_library_test.cpp
@ -0,0 +1,79 @@
+// Copyright 2018 Peter Dimov
+//
+// Distributed under the Boost Software License, Version 1.0.
+//
+// See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt
+
+#include "lib1_throw.hpp"
+#include "lib2_throw.hpp"
+#include "lib3_throw.hpp"
+#include <boost/exception/exception.hpp>
+#include <boost/exception_ptr.hpp>
+#include <boost/exception/get_error_info.hpp>
+#include <boost/core/lightweight_test.hpp>
+
+void test_catch_by_type()
+{
+    BOOST_TEST_THROWS( lib1::f(), lib1::exception );
+    BOOST_TEST_THROWS( lib2::f(), lib2::exception );
+    BOOST_TEST_THROWS( lib3::f(), lib3::exception );
+}
+
+void test_catch_by_exception()
+{
+    BOOST_TEST_THROWS( lib2::f(), boost::exception );
+    BOOST_TEST_THROWS( lib3::f(), boost::exception );
+}
+
+void test_exception_ptr()
+{
+    try
+    {
+        lib2::f();
+    }
+    catch( ... )
+    {
+        boost::exception_ptr p = boost::current_exception();
+
+        BOOST_TEST_THROWS( boost::rethrow_exception( p ), lib2::exception );
+        BOOST_TEST_THROWS( boost::rethrow_exception( p ), boost::exception );
+    }
+
+    try
+    {
+        lib3::f();
+    }
+    catch( ... )
+    {
+        boost::exception_ptr p = boost::current_exception();
+
+        BOOST_TEST_THROWS( boost::rethrow_exception( p ), lib3::exception );
+        BOOST_TEST_THROWS( boost::rethrow_exception( p ), boost::exception );
+    }
+}
+
+void test_throw_line()
+{
+    try
+    {
+        lib3::f();
+    }
+    catch( boost::exception const & x )
+    {
+        int const * line = boost::get_error_info<boost::throw_line>( x );
+
+        BOOST_TEST( line != 0 );
+        BOOST_TEST_EQ( *line, 13 );
+    }
+}
+
+int main()
+{
+    test_catch_by_type();
+    test_catch_by_exception();
+    test_exception_ptr();
+    test_throw_line();
+
+    return boost::report_errors();
+}
Author	SHA1	Message	Date
Peter Dimov	1e507924ce	Mark throw_exception with BOOST_NORETURN. Closes #12 .	2019-06-03 03:06:40 +03:00
Peter Dimov	50c34dee24	Switch Appveyor to 2015 image	2019-04-14 17:51:51 +03:00
Peter Dimov	37dfb7fe92	Remove essentials from yml files	2018-12-22 05:16:16 +02:00
Peter Dimov	9dfba607d9	Update .yml files	2018-12-18 21:58:55 +02:00
Peter Dimov	074bc77efb	Merge branch 'feature/wrapexcept' into develop	2018-09-30 04:07:21 +03:00
Peter Dimov	9d5b953dcf	Merge branch 'develop'	2018-09-30 04:05:46 +03:00
Peter Dimov	eafb1c877b	Add 'unsupported' comment to CMakeLists.txt	2018-09-30 04:05:09 +03:00
Peter Dimov	dd7d2a273c	Merge branch 'feature/more-tests' into feature/wrapexcept	2018-09-27 08:27:02 +03:00
Peter Dimov	9b99dd5f60	Add tests for throw_line	2018-09-27 08:26:29 +03:00
Peter Dimov	322d7611af	Use boost::wrapexcept<E> as the thrown exception type	2018-09-27 08:13:59 +03:00
Peter Dimov	56dd1c4111	Add/use exception_detail::enable_both	2018-09-27 07:39:18 +03:00
Peter Dimov	a732dfad3c	Add boost::exception, exception_ptr tests to throw_from_library_test as well	2018-09-27 07:23:52 +03:00
Peter Dimov	6845ba892d	Add test that uses boost::exception_ptr	2018-09-27 07:15:53 +03:00
Peter Dimov	a17f4bad42	Add test that catches by boost::exception	2018-09-27 07:10:41 +03:00
Peter Dimov	c807ae9201	Merge branch 'fix-c4668' of https://github.com/pkolbus/throw_exception into feature/pr-7	2018-09-27 06:27:32 +03:00
Peter Dimov	fe0f62bf17	Move BOOST_SYMBOL_VISIBLE after class	2018-09-27 00:53:52 +03:00
Peter Dimov	4714760035	Merge branch 'develop' of https://github.com/epvbergen/throw_exception into feature/symbol-visible	2018-09-27 00:52:07 +03:00
Peter Dimov	72564448cf	Merge pull request #11 from Kojoley/patch-1 Removed extra semicolon	2018-09-26 15:58:02 +03:00
Nikita Kniazev	7e2f1b4ecd	Removed extra semicolon	2018-09-26 15:28:19 +03:00
Peter Dimov	9d43946812	Add BOOST_SYMBOL_VISIBLE to exception types in throw_from_library_test	2018-09-26 03:48:09 +03:00
Peter Dimov	ca46976908	Add -d0 to b2 headers on Appveyor	2018-09-25 21:32:23 +03:00
Peter Dimov	2fdcaa3be1	Merge branch 'develop' of https://github.com/boostorg/throw_exception into develop	2018-09-25 21:28:14 +03:00
Peter Dimov	3fba666bea	Update appveyor.yml	2018-09-25 21:28:01 +03:00
Peter Dimov	376fc078b5	Merge pull request #6 from pgroke-dt/develop Don't include stuff inside #pragma warning push/pop, include boost/config.hpp before testing BOOST_ macros.	2018-09-25 20:56:31 +03:00
Peter Dimov	614cbc4f34	Add throw_from_library_test	2018-09-25 20:55:04 +03:00
Peter Dimov	ee45839a78	Add appveyor.yml	2018-09-25 20:18:43 +03:00
Peter Dimov	e3b556a978	Add .travis.yml	2018-09-25 16:00:51 +03:00
van Bergen Emile	8b879067f7	Replaced hardcoded symbol visibility for GCC with BOOST_SYMBOL_VISIBLE	2018-09-25 10:40:26 +02:00
Peter Dimov	40e067d7b7	Merge commit '56d65d5f625ed118f6052cc8f924f8ec21913089'	2018-09-24 07:09:18 +03:00
Peter Dimov	940df3e051	Merge branch 'master' into develop	2018-09-24 07:07:36 +03:00
Peter Dimov	4fd6f2aa0e	Merge pull request #8 from Mike-Devel/min_cmake [CMake] Generate cmake target that other libraries can use	2018-09-20 14:16:24 +03:00
Mike Dev	aec4ca6914	[CMake] Fix library name	2018-09-20 12:57:12 +02:00
Mike Dev	10f3663798	[CMake] Generate cmake target that other libraries can use ... to express their dependency on this library and retrieve any configuration information such as the include directory, binary to link to (if any), transitive dependencies, necessary compiler options or the required c++ standards level.	2018-09-20 12:25:24 +02:00
Peter Kolbus	f796dd892a	Fix MSVC C4668 in exception.hpp Fix MSVC C4668 warnings (undefined preprocessor macro) for __GNUC__ and __GNUC_MINOR__ by checking if __GNUC__ is defined first.	2018-03-26 22:39:26 -05:00
Peter Kolbus	f5022b5ca8	Fix MSVC C4668 in throw_exception.hpp Fix MSVC C4668 warnings (undefined preprocessor macro) for __GNUC__ and __GNUC_MINOR__ by checking if __GNUC__ is defined first.	2018-03-26 22:38:33 -05:00
Paul Groke	a0ca8113fd	Merge branch 'develop' of https://github.com/boostorg/throw_exception into develop # Conflicts: # include/boost/throw_exception.hpp	2017-02-21 18:06:51 +01:00
Paul Groke	cce19ef60f	Don't include stuff inside #pragma warning push/pop, include boost/config.hpp before testing BOOST_ macros.	2017-02-15 13:18:06 +01:00
Emil Dotchevski	c548923b32	Merge branch 'develop'	2016-11-07 11:30:38 -08:00
Emil Dotchevski	fc1ca8aef6	Merge branch 'develop' of https://github.com/boostorg/throw_exception	2016-06-07 12:58:24 -07:00
zajo	c89a2db112	Merge pull request #4 from vslavik/fix-clone_impl-visibility Use default visibility for exception_detail::clone_impl<T>	2015-10-11 15:09:46 -07:00
Václav Slavík	f52e2fe315	Use default visibility for exception_detail::clone_impl<> When building code with hidden visibility on ELF, exception classes must explicitly use the default visibility for catching to work across shared objects; the same must be done for all their base classes. While other classes in the boost::exception_detail namespace had visibility adjusted accordingly, clone_impl<T> didn't, so remedy that.	2015-10-10 16:44:52 +02:00