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

Merge branch 'master' into cmake_love

Browse Source
This commit is contained in:
Simon Brand
2019-06-25 11:19:42 +01:00
parent 4700f852c7 1fb40294e6
commit 66ea64f9af
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -42,8 +42,6 @@ tl::expected<image,fail_reason> get_cute_cat (const image& img) {
} }
``` ```
Full documentation available at [expected.tartanllama.xyz](https://expected.tartanllama.xyz)
The interface is the same as `std::expected` as proposed in [p0323r3](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0323r3.pdf), but the following member functions are also defined. Explicit types are for clarity. The interface is the same as `std::expected` as proposed in [p0323r3](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0323r3.pdf), but the following member functions are also defined. Explicit types are for clarity.
- `map`: carries out some operation on the stored object if there is one. - `map`: carries out some operation on the stored object if there is one.

4
include/tl/expected.hpp
View File

@@ -85,7 +85,7 @@ namespace tl {
#ifdef _GLIBCXX_VECTOR #ifdef _GLIBCXX_VECTOR
template<class T, class A> template<class T, class A>
struct is_trivially_copy_constructible<std::vector<T,A>> struct is_trivially_copy_constructible<std::vector<T,A>>
: std::is_trivially_copy_constructible<T>{}; : std::false_type{};
#endif #endif
} }
} }
@@ -1881,7 +1881,7 @@ private:
using e_is_nothrow_move_constructible = std::true_type; using e_is_nothrow_move_constructible = std::true_type;
using move_constructing_e_can_throw = std::false_type; using move_constructing_e_can_throw = std::false_type;
void swap_where_both_have_value(expected &rhs, t_is_void) noexcept { void swap_where_both_have_value(expected &/*rhs*/ , t_is_void) noexcept {
// swapping void is a no-op // swapping void is a no-op
} }