Revert operator bool() to its pre-failed value() != 0 meaning

... 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.

.travis.yml

@@ -1,4 +1,4 @@
-# Copyright 2016, 2017, 2018 Peter Dimov
+# 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)
 
@@ -6,8 +6,6 @@ language: cpp
 
 sudo: false
 
-python: "2.7"
-
 branches:
   only:
     - master
@@ -109,7 +107,7 @@ matrix:
 
     - os: linux
       compiler: g++-8
-      env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=03,11,14,17
+      env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=03,11,14,17,2a
       addons:
         apt:
           packages:
@@ -320,6 +318,17 @@ matrix:
             - 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,1z UBSAN_OPTIONS=print_stacktrace=1
@@ -352,13 +361,20 @@ matrix:
       compiler: clang++
       env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z
 
+    - os: linux
+      compiler: g++
+      env: CMAKE_SUBDIR_TEST=1
+      script:
+      - cd libs/system/test/cmake_subdir_test && mkdir __build__ && cd __build__
+      - cmake ..
+      - cmake --build .
+      - cmake --build . --target check
+
 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/build
-  - git submodule update --init libs/config
   - git submodule update --init tools/boostdep
   - cp -r $TRAVIS_BUILD_DIR/* libs/system
   - python tools/boostdep/depinst/depinst.py system

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(BoostSystem LANGUAGES CXX)
+
+add_library(boost_system INTERFACE)
+add_library(Boost::system ALIAS boost_system)
+
+target_include_directories(boost_system INTERFACE include)
+
+target_link_libraries(boost_system
+    INTERFACE
+        Boost::config
+        Boost::winapi
+)

appveyor.yml

@@ -46,10 +46,8 @@ install:
   - cd ..
   - git clone -b %BOOST_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root
   - cd boost-root
-  - git submodule update --init tools/build
-  - git submodule update --init libs/config
   - git submodule update --init tools/boostdep
-  - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\system
+  - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\system\
   - python tools/boostdep/depinst/depinst.py system
   - cmd /c bootstrap
   - b2 -d0 headers

doc/system/reference.adoc

@@ -626,7 +626,7 @@ constexpr explicit operator bool() const noexcept;
 [none]
 * {blank}
 +
-Returns: :: `failed()`.
+Returns: :: `val_ != 0`.
 
 ```
 operator std::error_code() const;
@@ -789,7 +789,7 @@ constexpr explicit operator bool() const noexcept;
 [none]
 * {blank}
 +
-Returns: :: `failed()`.
+Returns: :: `val_ != 0`.
 
 ```
 operator std::error_condition() const;

include/boost/system/detail/system_category_win32.hpp

@@ -81,37 +81,54 @@ inline char const * system_category_message_win32( int ev, char * buffer, std::s
         return buffer;
     }
 
-#if defined(__GNUC__)
-# define BOOST_SYSTEM_ALLOCA __builtin_alloca
-#else
-# define BOOST_SYSTEM_ALLOCA _alloca
+    boost::winapi::UINT_ const code_page = message_cp_win32();
+
+    int r = 0;
+
+#if !defined(BOOST_NO_ANSI_APIS)
+
+    if( code_page == boost::winapi::CP_ACP_ )
+    {
+        using namespace boost::winapi;
+
+        DWORD_ retval = boost::winapi::FormatMessageA(
+            FORMAT_MESSAGE_FROM_SYSTEM_ | FORMAT_MESSAGE_IGNORE_INSERTS_,
+            NULL,
+            ev,
+            MAKELANGID_( LANG_NEUTRAL_, SUBLANG_DEFAULT_ ), // Default language
+            buffer,
+            static_cast<DWORD_>( len ),
+            NULL
+        );
+
+        r = static_cast<int>( retval );
+    }
+    else
+
 #endif
 
-    wchar_t * wbuffer = static_cast<wchar_t*>( BOOST_SYSTEM_ALLOCA( len * sizeof( wchar_t ) ) );
-
-#undef BOOST_SYSTEM_ALLOCA
-
-    using namespace boost::winapi;
-
-    DWORD_ retval = boost::winapi::FormatMessageW(
-        FORMAT_MESSAGE_FROM_SYSTEM_ | FORMAT_MESSAGE_IGNORE_INSERTS_,
-        NULL,
-        ev,
-        MAKELANGID_( LANG_NEUTRAL_, SUBLANG_DEFAULT_ ), // Default language
-        wbuffer,
-        static_cast<DWORD_>( len ),
-        NULL
-    );
-
-    if( retval == 0 )
     {
-        return unknown_message_win32( ev, buffer, len );
+        using namespace boost::winapi;
+
+        wchar_t * lpMsgBuf = 0;
+
+        DWORD_ retval = boost::winapi::FormatMessageW(
+            FORMAT_MESSAGE_ALLOCATE_BUFFER_ | FORMAT_MESSAGE_FROM_SYSTEM_ | FORMAT_MESSAGE_IGNORE_INSERTS_,
+            NULL,
+            ev,
+            MAKELANGID_( LANG_NEUTRAL_, SUBLANG_DEFAULT_ ), // Default language
+            (LPWSTR_) &lpMsgBuf,
+            0,
+            NULL
+        );
+
+        if( retval != 0 )
+        {
+            r = boost::winapi::WideCharToMultiByte( code_page, 0, lpMsgBuf, -1, buffer, static_cast<int>( len ), NULL, NULL );
+            boost::winapi::LocalFree( lpMsgBuf );
+        }
     }
 
-    UINT_ const code_page = message_cp_win32();
-
-    int r = boost::winapi::WideCharToMultiByte( code_page, 0, wbuffer, -1, buffer, static_cast<int>( len ), NULL, NULL );
-
     if( r == 0 )
     {
         return unknown_message_win32( ev, buffer, len );

include/boost/system/error_code.hpp

@@ -499,7 +499,7 @@ public:
 
     BOOST_SYSTEM_CONSTEXPR explicit operator bool() const BOOST_NOEXCEPT  // true if error
     {
-        return failed_;
+        return val_ != 0;
     }
 
 #else
@@ -509,12 +509,12 @@ public:
 
     BOOST_SYSTEM_CONSTEXPR operator unspecified_bool_type() const BOOST_NOEXCEPT  // true if error
     {
-        return failed_? unspecified_bool_true: 0;
+        return val_ != 0? unspecified_bool_true: 0;
     }
 
     BOOST_SYSTEM_CONSTEXPR bool operator!() const BOOST_NOEXCEPT  // true if no error
     {
-        return !failed_;
+        return val_ == 0;
     }
 
 #endif
@@ -640,7 +640,7 @@ public:
 
     BOOST_SYSTEM_CONSTEXPR explicit operator bool() const BOOST_NOEXCEPT  // true if error
     {
-        return failed_;
+        return val_ != 0;
     }
 
 #else
@@ -650,12 +650,12 @@ public:
 
     BOOST_SYSTEM_CONSTEXPR operator unspecified_bool_type() const  BOOST_NOEXCEPT // true if error
     {
-        return failed_? unspecified_bool_true: 0;
+        return val_ != 0? unspecified_bool_true: 0;
     }
 
     BOOST_SYSTEM_CONSTEXPR bool operator!() const BOOST_NOEXCEPT // true if no error
     {
-        return !failed_;
+        return val_ == 0;
     }
 
 #endif

test/Jamfile.v2

@@ -1,7 +1,7 @@
 # Boost System Library test Jamfile
 
 # Copyright Beman Dawes 2003, 2006
-# Copyright 2017, 2018 Peter Dimov
+# Copyright 2017-2019 Peter Dimov
 
 # Distributed under the Boost Software License, Version 1.0.
 # See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt
@@ -9,109 +9,37 @@
 # See library home page at http://www.boost.org/libs/system
 
 import testing ;
-import os ;
 
-project
-    : requirements
-      <library>/boost/system//boost_system
-    ;
+lib throw_test : throw_test.cpp : <link>shared:<define>THROW_DYN_LINK=1 ;
 
-   lib throw_test : throw_test.cpp : <link>shared:<define>THROW_DYN_LINK=1 ;
+lib single_instance_lib1 : single_instance_1.cpp : <link>shared:<define>SINGLE_INSTANCE_DYN_LINK ;
+lib single_instance_lib2 : single_instance_2.cpp : <link>shared:<define>SINGLE_INSTANCE_DYN_LINK ;
 
-   lib single_instance_lib1 : single_instance_1.cpp : <link>shared:<define>SINGLE_INSTANCE_DYN_LINK ;
-   lib single_instance_lib2 : single_instance_2.cpp : <link>shared:<define>SINGLE_INSTANCE_DYN_LINK ;
-
-   rule cxx03 ( properties * )
-   {
-      local result ;
-
-      if <toolset>gcc in $(properties)
-      {
-         result = <cxxflags>-std=c++98 ; # 4.4 has no 03
-      }
-      else if <toolset>clang in $(properties)
-      {
-         result = <cxxflags>-std=c++03 ;
-      }
-      else
-      {
-         result = <build>no ;
-      }
-
-      return $(result) ;
-   }
-
-   rule cxx11 ( properties * )
-   {
-      local result ;
-
-      if <toolset>gcc in $(properties)
-      {
-         result = <cxxflags>-std=c++0x ; # 4.6 has no 11
-      }
-      else if <toolset>clang in $(properties)
-      {
-         result = <cxxflags>-std=c++11 ;
-      }
-      else
-      {
-         result = <build>no ;
-      }
-
-      return $(result) ;
-   }
-
-   rule system-run- ( sources + )
-   {
-      local result ;
-
-      result += [ run $(sources) : : : <link>static : $(sources[1]:B)_static ] ;
-      result += [ run $(sources) : : : <link>shared : $(sources[1]:B)_shared ] ;
-      result += [ run $(sources) : : : -<library>/boost/system//boost_system <define>BOOST_ERROR_CODE_HEADER_ONLY : $(sources[1]:B)_header ] ;
-
-      return $(result) ;
-   }
-
-if [ os.environ UBSAN ]
+rule system-run ( sources + )
 {
-   rule system-run ( sources + )
-   {
-      # The 03/11 tests are ODR violations, no point running them under -fsanitize=undefined
-      return [ system-run- $(sources) ] ;
-   }
-}
-else
-{
-   rule system-run ( sources + )
-   {
-      local result = [ system-run- $(sources) ] ;
+    local result ;
 
-      # Test a source file built with -std=c++03 linked with a System library built without -std=c++03
-      result += [ run $(sources) : : : <link>static <conditional>@cxx03 : $(sources[1]:B)_static_03 ] ;
-      result += [ run $(sources) : : : <link>shared <conditional>@cxx03 : $(sources[1]:B)_shared_03 ] ;
+    result += [ run $(sources) ] ;
+    result += [ run $(sources) : : : <library>/boost/system//boost_system <link>static : $(sources[1]:B)_static ] ;
+    result += [ run $(sources) : : : <library>/boost/system//boost_system <link>shared : $(sources[1]:B)_shared ] ;
+    result += [ run $(sources) : : : <define>BOOST_NO_ANSI_APIS : $(sources[1]:B)_no_ansi ] ;
+    result += [ run $(sources) : : : <define>BOOST_SYSTEM_USE_UTF8 : $(sources[1]:B)_utf8 ] ;
 
-      # Test a source file built with -std=c++11 linked with a System library built without -std=c++11
-      result += [ run $(sources) : : : <link>static <conditional>@cxx11 : $(sources[1]:B)_static_11 ] ;
-      result += [ run $(sources) : : : <link>shared <conditional>@cxx11 : $(sources[1]:B)_shared_11 ] ;
-
-      return $(result) ;
-   }
+    return $(result) ;
 }
 
 system-run error_code_test.cpp ;
 system-run error_code_user_test.cpp ;
 system-run system_error_test.cpp ;
 
-run dynamic_link_test.cpp throw_test :  :  : <link>shared : throw_test_shared ;
+run dynamic_link_test.cpp throw_test : : : <link>shared : throw_test_shared ;
 
 system-run initialization_test.cpp ;
-
-run header_only_test.cpp : : : -<library>/boost/system//boost_system ;
-run header_only_test.cpp : : : -<library>/boost/system//boost_system <define>BOOST_NO_ANSI_APIS : header_only_test_no_ansi ;
+system-run header_only_test.cpp ;
 
 run config_test.cpp : : : <test-info>always_show_run_output ;
 
-system-run- std_interop_test.cpp ;
+system-run std_interop_test.cpp ;
 system-run std_mismatch_test.cpp ;
 
 system-run single_instance_test.cpp single_instance_1.cpp single_instance_2.cpp ;
@@ -120,7 +48,7 @@ run single_instance_test.cpp single_instance_lib1 single_instance_lib2 : : : <li
 
 system-run before_main_test.cpp ;
 run-fail throws_assign_fail.cpp ;
-system-run- constexpr_test.cpp ;
+system-run constexpr_test.cpp ;
 system-run win32_hresult_test.cpp ;
 
 system-run error_category_test.cpp ;
@@ -128,7 +56,7 @@ system-run generic_category_test.cpp ;
 system-run system_category_test.cpp ;
 system-run after_main_test.cpp ;
 system-run failed_test.cpp ;
-system-run- failed_constexpr_test.cpp ;
+system-run failed_constexpr_test.cpp ;
 
 # Quick (CI) test
 run quick.cpp ;

test/cmake_subdir_test/CMakeLists.txt

@@ -0,0 +1,22 @@
+# 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
+
+cmake_minimum_required(VERSION 3.5)
+
+project(cmake_subdir_test LANGUAGES CXX)
+
+add_subdirectory(../.. boostorg/system)
+add_subdirectory(../../../assert boostorg/assert)
+add_subdirectory(../../../config boostorg/config)
+add_subdirectory(../../../core boostorg/core)
+add_subdirectory(../../../predef boostorg/predef)
+add_subdirectory(../../../winapi boostorg/winapi)
+
+add_executable(quick ../quick.cpp)
+target_link_libraries(quick Boost::system Boost::core)
+
+enable_testing()
+add_test(quick quick)
+
+add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -C $<CONFIG>)

test/failed_test.cpp

@@ -123,13 +123,13 @@ template<class Ec> void test()
 
     {
         Ec ec( 0, http_category() );
-        TEST_FAILED( ec );
+        BOOST_TEST( ec.failed() );
 
         ec.assign( 200, http_category() );
-        TEST_NOT_FAILED( ec );
+        BOOST_TEST( !ec.failed() );
 
         ec = Ec( 404, http_category() );
-        TEST_FAILED( ec );
+        BOOST_TEST( ec.failed() );
     }
 
 }