TartanLlama/expected
1
0
Fork 1
mirror of https://github.com/TartanLlama/expected.git synced 2025-08-03 19:04:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-ci

Browse Source
This commit is contained in:
Sy Brand
2025-07-12 11:49:24 +01:00
committed by GitHub
parent de38bbc5e9 28f9aa7b8c
commit f3190092d2
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/cmake.yml vendored
View File

@@ -95,7 +95,6 @@ jobs:
install: apt install -y clang-10 install: apt install -y clang-10
- cxx: clang++-11 - cxx: clang++-11
install: apt install -y clang-11 install: apt install -y clang-11
- cxx: clang++-6.0 - cxx: clang++-6.0
std: 17 std: 17

10
include/tl/expected.hpp
View File

@@ -132,8 +132,14 @@ struct is_trivially_copy_constructible<std::vector<T, A>> : std::false_type {};
#define TL_EXPECTED_11_CONSTEXPR constexpr #define TL_EXPECTED_11_CONSTEXPR constexpr
#endif #endif
#if TL_CPLUSPLUS >= 201703L
#define TL_EXPECTED_NODISCARD [[nodiscard]]
#else
#define TL_EXPECTED_NODISCARD
#endif
namespace tl { namespace tl {
template <class T, class E> class [[nodiscard]] expected; template <class T, class E> class TL_EXPECTED_NODISCARD expected;
#ifndef TL_MONOSTATE_INPLACE_MUTEX #ifndef TL_MONOSTATE_INPLACE_MUTEX
#define TL_MONOSTATE_INPLACE_MUTEX #define TL_MONOSTATE_INPLACE_MUTEX
@@ -1276,7 +1282,7 @@ private:
/// has been destroyed. The initialization state of the contained object is /// has been destroyed. The initialization state of the contained object is
/// tracked by the expected object. /// tracked by the expected object.
template <class T, class E> template <class T, class E>
class [[nodiscard]] expected : class TL_EXPECTED_NODISCARD expected :
private detail::expected_move_assign_base<T, E>, private detail::expected_move_assign_base<T, E>,
private detail::expected_delete_ctor_base<T, E>, private detail::expected_delete_ctor_base<T, E>,
private detail::expected_delete_assign_base<T, E>, private detail::expected_delete_assign_base<T, E>,