Disable _CrtDbgReport message boxes, displayed on debug iterator violations

Include lightweight_test from core and workaround from config
Add CMake install support
2020-01-01 17:17:43 +02:00 · 2020-01-01 09:02:46 -05:00 · 2019-12-28 18:47:11 +02:00 · 2019-12-15 12:46:55 -05:00 · 2019-12-02 02:15:55 +02:00 · 2019-12-02 01:11:04 +03:00
30 changed files with 63 additions and 34 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,13 +1,10 @@
-# Copyright 2018 Peter Dimov
+# Copyright 2018, 2019 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

-# 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...3.16)

-cmake_minimum_required(VERSION 3.5)
-
-project(BoostCore LANGUAGES CXX)
+project(boost_core VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX)

 add_library(boost_core INTERFACE)
 add_library(Boost::core ALIAS boost_core)
@@ -15,7 +12,14 @@ add_library(Boost::core ALIAS boost_core)
 target_include_directories(boost_core INTERFACE include)

 target_link_libraries(boost_core
-    INTERFACE
-        Boost::assert
-        Boost::config
+  INTERFACE
+    Boost::assert
+    Boost::config
 )
+
+if(BOOST_SUPERPROJECT_VERSION)
+
+  include(BoostInstall)
+  boost_install(TARGETS boost_core HEADER_DIRECTORY include/)
+
+endif()
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -22,10 +22,17 @@ environment:
      ADDRMD: 32,64

    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      TOOLSET: msvc-14.1,clang-win
+      TOOLSET: msvc-14.1
      ADDRMD: 32,64
      CXXSTD: 14,17

+    # clang-win 32 bit fails to link with "unable to load mspdbcore.dll (error code: 126)"
+
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      TOOLSET: clang-win
+      ADDRMD: 64
+      CXXSTD: 14,17
+
    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
      TOOLSET: msvc-14.2
      ADDRMD: 32,64
--- a/doc/empty_value.qbk
+++ b/doc/empty_value.qbk
@@ -97,6 +97,8 @@ public:
    T& get() noexcept;
 };

+inline constexpr empty_init_t empty_init{ };
+
 } /* boost */
 ```

--- a/include/boost/core/empty_value.hpp
+++ b/include/boost/core/empty_value.hpp
@@ -139,6 +139,9 @@ public:

 using empty_::empty_value;

+BOOST_INLINE_VARIABLE
+BOOST_CONSTEXPR_OR_CONST empty_init_t empty_init = empty_init_t();
+
 } /* boost */

 #endif
--- a/include/boost/core/lightweight_test.hpp
+++ b/include/boost/core/lightweight_test.hpp
@@ -30,6 +30,10 @@
 #include <cstring>
 #include <cstddef>

+#if defined(_MSC_VER) && defined(_CPPLIB_VER) && defined(_DEBUG)
+# include <crtdbg.h>
+#endif
+
 //  IDE's like Visual Studio perform better if output goes to std::cout or
 //  some other stream, so allow user to configure output stream:
 #ifndef BOOST_LIGHTWEIGHT_TEST_OSTREAM
@@ -48,7 +52,13 @@ public:
        : report_(false)
        , errors_(0) {
 #if defined(_MSC_VER) && (_MSC_VER > 1310)
+        // disable message boxes on assert(), abort()
        ::_set_abort_behavior(0, _WRITE_ABORT_MSG | _CALL_REPORTFAULT);
+#endif
+#if defined(_MSC_VER) && defined(_CPPLIB_VER) && defined(_DEBUG)
+        // disable message boxes on iterator debugging violations
+        _CrtSetReportMode( _CRT_ASSERT, _CRTDBG_MODE_FILE );
+        _CrtSetReportFile( _CRT_ASSERT, _CRTDBG_FILE_STDERR );
 #endif
    }

--- a/include/boost/core/swap.hpp
+++ b/include/boost/core/swap.hpp
@@ -23,8 +23,11 @@

 #include <boost/core/enable_if.hpp>
 #include <boost/config.hpp>
+#if __cplusplus >= 201103L || defined(BOOST_MSVC)
 #include <utility> //for std::swap (C++11)
+#else
 #include <algorithm> //for std::swap (C++98)
+#endif
 #include <cstddef> //for std::size_t

 namespace boost_swap_impl
--- a/test/addressof_fn_test.cpp
+++ b/test/addressof_fn_test.cpp
@@ -16,7 +16,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt

 #include <boost/utility/addressof.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>


 void f0()
--- a/test/addressof_np_test.cpp
+++ b/test/addressof_np_test.cpp
@@ -7,7 +7,7 @@
 //

 #include <boost/utility/addressof.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <cstddef>

 #if defined( BOOST_NO_CXX11_NULLPTR )
--- a/test/addressof_test.cpp
+++ b/test/addressof_test.cpp
@@ -20,7 +20,7 @@
 #pragma warning(pop)
 #endif

-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>

 template<class T> void scalar_test( T * = 0 )
 {
--- a/test/addressof_test2.cpp
+++ b/test/addressof_test2.cpp
@@ -22,7 +22,7 @@
 #pragma warning(pop)
 #endif

-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>

 template<class T> void scalar_test( T * = 0 )
 {
--- a/test/eif_constructors.cpp
+++ b/test/eif_constructors.cpp
@@ -12,7 +12,7 @@

 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>

 using boost::enable_if;
 using boost::disable_if;
--- a/test/eif_dummy_arg_disambiguation.cpp
+++ b/test/eif_dummy_arg_disambiguation.cpp
@@ -12,7 +12,7 @@

 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_arithmetic.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>

 using boost::enable_if;
 using boost::disable_if;
--- a/test/eif_lazy.cpp
+++ b/test/eif_lazy.cpp
@@ -12,7 +12,7 @@

 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_same.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>

 using boost::enable_if_c;
 using boost::lazy_enable_if_c;
--- a/test/eif_lazy_test.cpp
+++ b/test/eif_lazy_test.cpp
@@ -14,7 +14,7 @@

 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_same.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>

 using boost::lazy_enable_if;
 using boost::lazy_disable_if;
--- a/test/eif_member_templates.cpp
+++ b/test/eif_member_templates.cpp
@@ -12,7 +12,7 @@

 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_arithmetic.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>

 using boost::enable_if;
 using boost::disable_if;
--- a/test/eif_namespace_disambiguation.cpp
+++ b/test/eif_namespace_disambiguation.cpp
@@ -13,7 +13,7 @@
 #include <boost/config.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_arithmetic.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>

 using boost::enable_if;
 using boost::is_arithmetic;
--- a/test/eif_no_disambiguation.cpp
+++ b/test/eif_no_disambiguation.cpp
@@ -13,7 +13,7 @@
 #include <boost/config.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_arithmetic.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>

 using boost::enable_if;
 using boost::is_arithmetic;
--- a/test/eif_partial_specializations.cpp
+++ b/test/eif_partial_specializations.cpp
@@ -12,7 +12,7 @@

 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_arithmetic.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>

 using boost::enable_if_has_type;
 using boost::enable_if_c;
--- a/test/explicit_operator_bool_noexcept.cpp
+++ b/test/explicit_operator_bool_noexcept.cpp
@@ -18,7 +18,7 @@

 #if !defined(BOOST_NO_CXX11_NOEXCEPT)

-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/utility/explicit_operator_bool.hpp>

 namespace {
--- a/test/lightweight_test_fail.cpp
+++ b/test/lightweight_test_fail.cpp
@@ -8,7 +8,7 @@
 // http://www.boost.org/LICENSE_1_0.txt
 //

-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>

 int main()
 {
--- a/test/lightweight_test_fail2.cpp
+++ b/test/lightweight_test_fail2.cpp
@@ -8,7 +8,7 @@
 // http://www.boost.org/LICENSE_1_0.txt
 //

-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>

 int main()
 {
--- a/test/lightweight_test_fail3.cpp
+++ b/test/lightweight_test_fail3.cpp
@@ -8,7 +8,7 @@
 // http://www.boost.org/LICENSE_1_0.txt
 //

-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>

 int main()
 {
--- a/test/lightweight_test_fail4.cpp
+++ b/test/lightweight_test_fail4.cpp
@@ -8,7 +8,7 @@
 // http://www.boost.org/LICENSE_1_0.txt
 //

-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>

 int main()
 {
--- a/test/lightweight_test_fail5.cpp
+++ b/test/lightweight_test_fail5.cpp
@@ -8,7 +8,7 @@
 // http://www.boost.org/LICENSE_1_0.txt
 //

-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>

 struct X
 {
--- a/test/lightweight_test_fail6.cpp
+++ b/test/lightweight_test_fail6.cpp
@@ -8,7 +8,7 @@
 // http://www.boost.org/LICENSE_1_0.txt
 //

-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>

 struct X
 {
--- a/test/lightweight_test_test.cpp
+++ b/test/lightweight_test_test.cpp
@@ -9,7 +9,7 @@
 //

 #include <vector>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>

 struct X
 {
--- a/test/ref_ct_test.cpp
+++ b/test/ref_ct_test.cpp
@@ -9,7 +9,7 @@
 #include <boost/ref.hpp>
 #include <boost/core/is_same.hpp>
 #include <boost/static_assert.hpp>
-#include <boost/detail/workaround.hpp>
+#include <boost/config/workaround.hpp>

 namespace {

--- a/test/ref_fn_test.cpp
+++ b/test/ref_fn_test.cpp
@@ -16,7 +16,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt

 #include <boost/ref.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>


 void f0()
--- a/test/ref_test.cpp
+++ b/test/ref_test.cpp
@@ -7,7 +7,7 @@
 // see 'ref_ct_test.cpp' for compile-time part

 #include <boost/ref.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>

 namespace {
 using namespace boost;
--- a/test/sp_typeinfo_test.cpp
+++ b/test/sp_typeinfo_test.cpp
@@ -11,7 +11,7 @@
 #define BOOST_ALLOW_DEPRECATED_HEADERS

 #include <boost/detail/sp_typeinfo.hpp>
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <iostream>

 int main()
Author	SHA1	Message	Date
Peter Dimov	bda2b9b4b1	Disable _CrtDbgReport message boxes, displayed on debug iterator violations	2020-01-01 17:17:43 +02:00
Glen Fernandes	ac4c781cac	Include lightweight_test from core and workaround from config	2020-01-01 09:02:46 -05:00
Peter Dimov	72ca0d8664	Add CMake install support	2019-12-28 18:47:11 +02:00
Glen Fernandes	253b07f630	Add empty_init constant to documentation	2019-12-15 12:46:55 -05:00
Peter Dimov	e59271fdc2	Check BOOST_MSVC in addition to __cplusplus, because msvc doesn't define __cplusplus correctly	2019-12-02 02:15:55 +02:00
Nikita Kniazev	bc82adcd0b	Remove implementation specific handling	2019-12-02 01:11:04 +03:00
Nikita Kniazev	868cb07578	Try to include std::swap from the most lightweight header Based on Boost.Move idea	2019-12-01 17:28:07 +03:00
Andrey Semashev	38f71361fb	Add a convenience instance of empty_init_t (#65 ) * Added a convenience instance of empty_init_t. Closes https://github.com/boostorg/core/issues/63.	2019-11-23 21:00:59 -05:00
Peter Dimov	6d62fb5f5e	Remove clang-win 32 bit, because it fails to link with 'unable to load mspdbcore.dll (error code: 126)'	2019-11-23 21:52:53 +02:00
Peter Dimov	0d71f42365	Separate Appveyor Clang configurations	2019-11-23 21:11:26 +02:00