Skip to content

Commit 12fc5a5

Browse files
thinlangBryn Aspestrand
thinlang
and
Bryn Aspestrand
authored
Removing use of boost::variant and optional from stlab now that it has moved to C++17 (#531)
* Removing use of boost::variant and optional from stlab now that it has moved to C++17 * fixing one Windows error * adding using type for clarity * Update docs/tips/stop-using-out-arguments.md --------- Co-authored-by: Bryn Aspestrand <[email protected]>
1 parent 4044ffa commit 12fc5a5

File tree

24 files changed

+90
-387
lines changed

24 files changed

+90
-387
lines changed

‎CMakeLists.txt

-11
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ cmake_dependent_option( stlab.coverage
1818
"Enable binary instrumentation to collect test coverage information in the DEBUG configuration"
1919
OFF PROJECT_IS_TOP_LEVEL OFF )
2020

21-
stlab_check_disfunctional_variant_optional(STLAB_DEFAULT_USE_BOOST_CPP17_SHIMS)
22-
option( STLAB_USE_BOOST_CPP17_SHIMS "Use variant and optional from Boost instead of std. Useful for non-conforming compilers." ${STLAB_DEFAULT_USE_BOOST_CPP17_SHIMS} )
2321
stlab_check_disfunctional_coroutines(STLAB_DEFAULT_NO_STD_COROUTINES)
2422
option( STLAB_NO_STD_COROUTINES "Suppress usage of standard coroutines. Useful for non-conforming compilers." ${STLAB_DEFAULT_NO_STD_COROUTINES} )
2523
stlab_detect_thread_system(STLAB_DEFAULT_THREAD_SYSTEM)
@@ -35,10 +33,6 @@ if( BUILD_TESTING AND NOT Boost_unit_test_framework_FOUND )
3533
message( SEND_ERROR "BUILD_TESTING is enabled, but an installation of Boost.Test was not found." )
3634
endif()
3735

38-
if( STLAB_USE_BOOST_CPP17_SHIMS AND NOT Boost_FOUND )
39-
message( SEND_ERROR "STLAB_USE_BOOST_CPP17_SHIMS is enabled, but a Boost installation was not found." )
40-
endif()
41-
4236
if( (NOT STLAB_THREAD_SYSTEM STREQUAL "none") AND NOT Threads_FOUND )
4337
message( SEND_ERROR "STLAB_THREAD_SYSTEM is not \"none\", but a thread system was not found." )
4438
endif()
@@ -89,10 +83,6 @@ target_compile_definitions( stlab INTERFACE $<$<CXX_COMPILER_ID:MSVC>:NOMINMAX>
8983

9084
add_subdirectory( stlab )
9185

92-
if ( STLAB_USE_BOOST_CPP17_SHIMS )
93-
target_link_libraries( stlab INTERFACE Boost::boost )
94-
endif()
95-
9686
if ( NOT STLAB_THREAD_SYSTEM STREQUAL "none" )
9787
target_link_libraries( stlab INTERFACE Threads::Threads )
9888
endif()
@@ -109,7 +99,6 @@ elseif (STLAB_MAIN_EXECUTOR STREQUAL "qt6")
10999
target_link_libraries( stlab INTERFACE Qt6::Core )
110100
endif()
111101

112-
message(STATUS "stlab: Use Boost C++17 Shims: ${STLAB_USE_BOOST_CPP17_SHIMS}")
113102
message(STATUS "stlab: Disable Coroutines: ${STLAB_DEFAULT_NO_STD_COROUTINES}")
114103
message(STATUS "stlab: Thread System: ${STLAB_THREAD_SYSTEM}")
115104
message(STATUS "stlab: Task System: ${STLAB_TASK_SYSTEM}")

‎cmake/StlabUtil.cmake

-24
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,6 @@
44
include( CheckCXXSymbolExists )
55
include( CheckCXXSourceRuns )
66

7-
# Determine if the selected C++ compiler has functional versions of
8-
# 'std::variant' and 'std::optional'. Set the specified 'result_var' to 'TRUE'
9-
# if they are determined to be disfunctional and 'FALSE' otherwise. Note that
10-
# this check consists of a smoke test and does not check all the ways these
11-
# library components may be deficient.
12-
function( stlab_check_disfunctional_variant_optional result_var )
13-
check_cxx_source_runs( "
14-
#include <variant>
15-
#include <optional>
16-
17-
int main() {
18-
std::optional<int> op = 3;
19-
op = std::nullopt;
20-
21-
std::variant<int, char> v = 12;
22-
return 0;
23-
}" STLAB_HAVE_FUNCTIONAL_VARIANT_OPTIONAL )
24-
if( STLAB_HAVE_FUNCTIONAL_VARIANT_OPTIONAL )
25-
set( ${result_var} FALSE PARENT_SCOPE )
26-
else()
27-
set( ${result_var} TRUE PARENT_SCOPE )
28-
endif()
29-
endfunction()
30-
317
# Determine if the selected C++ compiler has functional coroutines. Set the
328
# specified 'result_var' to 'TRUE' if they are determined to be disfunctional
339
# and 'FALSE' otherwise. Note that this check consists of a smoke test and does

‎cmake/stlabConfig.cmake.in

-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
include( CMakeFindDependencyMacro )
22

3-
if ( @STLAB_USE_BOOST_CPP17_SHIMS@ )
4-
find_dependency( Boost 1.74.0 )
5-
endif()
6-
73
if ( @STLAB_TASK_SYSTEM@ STREQUAL "libdispatch" )
84
find_dependency( libdispatch )
95
endif()

‎docs/README.md

-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ Specify the following options:
6868
STLAB_NO_STD_COROUTINES ON
6969
STLAB_TASK_SYSTEM portable
7070
STLAB_THREAD_SYSTEM pthread
71-
STLAB_USE_BOOST_CPP17_SHIMS OFF
7271
stlab.coverage OFF
7372
```
7473

‎docs/libraries/concurrency/future.hpp/future3CT2C20enable_if_.6354105c/m_error.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ tags:
77
- method
88
defined_in_file: concurrency/future.hpp
99
overloads:
10-
stlab::optional<std::exception_ptr> error() const &:
10+
std::optional<std::exception_ptr> error() const &:
1111
annotation:
1212
- deprecated (Use exception() instead)
1313
description: __OPTIONAL__
1414
return: __OPTIONAL__
15-
signature_with_names: stlab::optional<std::exception_ptr> error() const &
15+
signature_with_names: std::optional<std::exception_ptr> error() const &
1616
---

‎docs/libraries/concurrency/future.hpp/future3CT2C20enable_if_.e055d50a/m_error.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ tags:
77
- method
88
defined_in_file: concurrency/future.hpp
99
overloads:
10-
stlab::optional<std::exception_ptr> error() const &:
10+
std::optional<std::exception_ptr> error() const &:
1111
annotation:
1212
- deprecated (Use exception() instead)
1313
description: Iff an error occurred, returns the stored exception pointer.
1414
return: __OPTIONAL__
15-
signature_with_names: stlab::optional<std::exception_ptr> error() const &
15+
signature_with_names: std::optional<std::exception_ptr> error() const &
1616
---
1717
Returns a potentially stored exception pointer. This function will be removed in future versions of the library. Use `exception()` instead.
1818

‎docs/libraries/concurrency/future.hpp/future3Cvoid2C20void3E/m_error.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ tags:
77
- method
88
defined_in_file: concurrency/future.hpp
99
overloads:
10-
stlab::optional<std::exception_ptr> error() const &:
10+
std::optional<std::exception_ptr> error() const &:
1111
annotation:
1212
- deprecated (Use exception() instead)
1313
description: __OPTIONAL__
1414
return: __OPTIONAL__
15-
signature_with_names: stlab::optional<std::exception_ptr> error() const &
15+
signature_with_names: std::optional<std::exception_ptr> error() const &
1616
---

‎docs/libraries/concurrency/future/future/error.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ defined-in-header: stlab/concurrency/future.hpp
66
tags:
77
- function
88
overloads:
9-
stlab::optional<std::exception_ptr> error():
9+
std::optional<std::exception_ptr> error():
1010
description: In case an error occurred, it returns the stored exception pointer.
1111
return: __OPTIONAL__
12-
signature_with_names: "[[deprecated]] stlab::optional<std::exception_ptr> error() const"
12+
signature_with_names: "[[deprecated]] std::optional<std::exception_ptr> error() const"
1313
---
1414
Returns a potentially stored exception pointer. This function will be removed in future versions of the library. Use `exception()` instead.
1515

‎docs/libraries/concurrency/future/future/get_try.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ defined-in-header: stlab/concurrency/future.hpp
66
tags:
77
- function
88
overloads:
9-
stlab::optional<T> get_try():
9+
std::optional<T> get_try():
1010
description: If `T` is not `void`, it returns an initialized `optional` if the future has succeeded, otherwise an empty `optional<T>`. In case that an error occurred it rethrows the captured exception.
1111
return: __OPTIONAL__
12-
signature_with_names: stlab::optional<T> get_try()
12+
signature_with_names: std::optional<T> get_try()
1313
bool get_try():
1414
description: If `T` is void it returns `true` if the future succeeded, otherwise `false`. In case that an error occurred it rethrows the captured exception.
1515
return: __OPTIONAL__

‎docs/libraries/concurrency/optional.hpp/index.md

-13
This file was deleted.

‎docs/libraries/concurrency/tuple_algorithm.hpp/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ tags:
88
library-type: sourcefile
99
typedefs:
1010
optional_placeholder_tuple:
11-
definition: std::tuple<stlab::optional<typename std::conditional<std::is_same<void, Ts>::value, detail::placeholder, Ts>::type>...>
11+
definition: std::tuple<std::optional<typename std::conditional<std::is_same<void, Ts>::value, detail::placeholder, Ts>::type>...>
1212
description: __MISSING__
1313
placeholder_tuple:
1414
definition: std::tuple<typename std::conditional<std::is_same<void, Ts>::value, detail::placeholder, Ts>::type...>

‎docs/libraries/concurrency/variant.hpp/f_get.md

-44
This file was deleted.

‎docs/libraries/concurrency/variant.hpp/f_index.md

-20
This file was deleted.

‎docs/libraries/concurrency/variant.hpp/index.md

-13
This file was deleted.

‎stlab/CMakeLists.txt

-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ target_sources( stlab INTERFACE
1313
concurrency/future.hpp
1414
concurrency/immediate_executor.hpp
1515
concurrency/main_executor.hpp
16-
concurrency/optional.hpp
1716
concurrency/progress.hpp
1817
concurrency/ready_future.hpp
1918
concurrency/serial_queue.hpp
@@ -23,7 +22,6 @@ target_sources( stlab INTERFACE
2322
concurrency/traits.hpp
2423
concurrency/tuple_algorithm.hpp
2524
concurrency/utility.hpp
26-
concurrency/variant.hpp
2725

2826
iterator/set_next.hpp
2927

‎stlab/concurrency/await.hpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include <condition_variable>
1616
#include <exception>
1717
#include <mutex>
18+
#include <optional>
1819
#include <type_traits>
1920
#include <utility>
2021

@@ -74,7 +75,7 @@ template <class T>
7475
struct _get_optional;
7576

7677
template <class T>
77-
struct _get_optional<stlab::optional<T>> {
78+
struct _get_optional<std::optional<T>> {
7879
template <class F>
7980
auto operator()(F&& f) {
8081
return *std::forward<F>(f);

0 commit comments

Comments
 (0)