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

Call function

Browse Source
This commit is contained in:
Simon Brand
2017-10-29 20:25:40 +00:00
parent ec3c96af64
commit d92ed4b0cb
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
expected.hpp
View File

@@ -42,7 +42,7 @@
#if (__cplusplus == 201103L || defined(TL_EXPECTED_MSVC2015) || \ #if (__cplusplus == 201103L || defined(TL_EXPECTED_MSVC2015) || \
defined(TL_EXPECTED_GCC49)) && \ defined(TL_EXPECTED_GCC49)) && \
!defined(TL_EXPECTED_GCC50) !defined(TL_EXPECTED_GCC54)
/// \exclude /// \exclude
#define TL_EXPECTED_11_CONSTEXPR #define TL_EXPECTED_11_CONSTEXPR
#else #else
@@ -995,7 +995,7 @@ public:
void emplace(std::initializer_list<U> il, Args &&... args) { void emplace(std::initializer_list<U> il, Args &&... args) {
if (has_value()) { if (has_value()) {
T t (il, std::forward<Args>(args)...); T t (il, std::forward<Args>(args)...);
*val = std::move(t); val() = std::move(t);
} }
else { else {
err().~unexpected<E>(); err().~unexpected<E>();
@@ -1009,7 +1009,7 @@ public:
void emplace(std::initializer_list<U> il, Args &&... args) { void emplace(std::initializer_list<U> il, Args &&... args) {
if (has_value()) { if (has_value()) {
T t (il, std::forward<Args>(args)...); T t (il, std::forward<Args>(args)...);
*val = std::move(t); val() = std::move(t);
} }
else { else {
auto tmp = std::move(err()); auto tmp = std::move(err());