Skip to content

Commit

Permalink
Regenerate single include editions to match trunk.
Browse files Browse the repository at this point in the history
  • Loading branch information
ned14 committed Apr 27, 2023
1 parent f3cbe84 commit 8131678
Show file tree
Hide file tree
Showing 4 changed files with 79 additions and 70 deletions.
6 changes: 3 additions & 3 deletions include/outcome/detail/revision.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ Distributed under the Boost Software License, Version 1.0.
*/

// Note the second line of this file must ALWAYS be the git SHA, third line ALWAYS the git SHA update time
#define OUTCOME_PREVIOUS_COMMIT_REF 91dcae155b2697d9992e956e503ff07f484dddfd
#define OUTCOME_PREVIOUS_COMMIT_DATE "2023-04-18 16:46:38 +00:00"
#define OUTCOME_PREVIOUS_COMMIT_UNIQUE 91dcae15
#define OUTCOME_PREVIOUS_COMMIT_REF f3cbe84e366402a65263905c48bed1d44727da5c
#define OUTCOME_PREVIOUS_COMMIT_DATE "2023-04-27 12:49:35 +00:00"
#define OUTCOME_PREVIOUS_COMMIT_UNIQUE f3cbe84e
42 changes: 21 additions & 21 deletions single-header/outcome-basic.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -996,9 +996,9 @@ Distributed under the Boost Software License, Version 1.0.
http://www.boost.org/LICENSE_1_0.txt)
*/
// Note the second line of this file must ALWAYS be the git SHA, third line ALWAYS the git SHA update time
#define OUTCOME_PREVIOUS_COMMIT_REF 91dcae155b2697d9992e956e503ff07f484dddfd
#define OUTCOME_PREVIOUS_COMMIT_DATE "2023-04-18 16:46:38 +00:00"
#define OUTCOME_PREVIOUS_COMMIT_UNIQUE 91dcae15
#define OUTCOME_PREVIOUS_COMMIT_REF f3cbe84e366402a65263905c48bed1d44727da5c
#define OUTCOME_PREVIOUS_COMMIT_DATE "2023-04-27 12:49:35 +00:00"
#define OUTCOME_PREVIOUS_COMMIT_UNIQUE f3cbe84e
#define OUTCOME_V2 (QUICKCPPLIB_BIND_NAMESPACE_VERSION(outcome_v2))
#ifdef _DEBUG
#define OUTCOME_V2_CXX_MODULE_NAME QUICKCPPLIB_BIND_NAMESPACE((QUICKCPPLIB_BIND_NAMESPACE_VERSION(outcome_v2d)))
Expand Down Expand Up @@ -2852,11 +2852,11 @@ namespace detail
bool all_good{false};
~_()
{
if(!all_good)
if(!this->all_good)
{
// We lost one of the values
a.set_have_lost_consistency(true);
b.set_have_lost_consistency(true);
this->a.set_have_lost_consistency(true);
this->b.set_have_lost_consistency(true);
}
}
} _{_status, o._status};
Expand All @@ -2873,11 +2873,11 @@ namespace detail
bool all_good{false};
~_()
{
if(!all_good)
if(!this->all_good)
{
// We lost one of the values
a.set_have_lost_consistency(true);
b.set_have_lost_consistency(true);
this->a.set_have_lost_consistency(true);
this->b.set_have_lost_consistency(true);
}
}
} _{_status, o._status};
Expand Down Expand Up @@ -2939,11 +2939,11 @@ namespace detail
bool all_good{true};
~_()
{
if(!all_good)
if(!this->all_good)
{
// We lost one of the values
a.set_have_lost_consistency(true);
b.set_have_lost_consistency(true);
this->a.set_have_lost_consistency(true);
this->b.set_have_lost_consistency(true);
}
}
} _{_status, o._status, &_value, &o._value, &_error, &o._error};
Expand Down Expand Up @@ -5848,25 +5848,25 @@ SIGNATURE NOT RECOGNISED
bool all_good{false};
~_()
{
if(!all_good)
if(!this->all_good)
{
// We lost one of the values
a._state._status.set_have_lost_consistency(true);
b._state._status.set_have_lost_consistency(true);
this->a._state._status.set_have_lost_consistency(true);
this->b._state._status.set_have_lost_consistency(true);
return;
}
if(exceptioned)
if(this->exceptioned)
{
// The value + error swap threw an exception. Try to swap back _ptr
try
{
strong_swap(all_good, a._ptr, b._ptr);
strong_swap(this->all_good, this->a._ptr, this->b._ptr);
}
catch(...)
{
// We lost one of the values
a._state._status.set_have_lost_consistency(true);
b._state._status.set_have_lost_consistency(true);
this->a._state._status.set_have_lost_consistency(true);
this->b._state._status.set_have_lost_consistency(true);
// throw away second exception
}
// Prevent has_value() == has_error() or has_value() == has_exception()
Expand All @@ -5882,8 +5882,8 @@ SIGNATURE NOT RECOGNISED
t->_state._status.set_have_error(true).set_have_lost_consistency(true);
}
};
check(&a);
check(&b);
check(&this->a);
check(&this->b);
}
}
} _{*this, o};
Expand Down
44 changes: 22 additions & 22 deletions single-header/outcome-experimental.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1021,9 +1021,9 @@ Distributed under the Boost Software License, Version 1.0.
http://www.boost.org/LICENSE_1_0.txt)
*/
// Note the second line of this file must ALWAYS be the git SHA, third line ALWAYS the git SHA update time
#define OUTCOME_PREVIOUS_COMMIT_REF 91dcae155b2697d9992e956e503ff07f484dddfd
#define OUTCOME_PREVIOUS_COMMIT_DATE "2023-04-18 16:46:38 +00:00"
#define OUTCOME_PREVIOUS_COMMIT_UNIQUE 91dcae15
#define OUTCOME_PREVIOUS_COMMIT_REF f3cbe84e366402a65263905c48bed1d44727da5c
#define OUTCOME_PREVIOUS_COMMIT_DATE "2023-04-27 12:49:35 +00:00"
#define OUTCOME_PREVIOUS_COMMIT_UNIQUE f3cbe84e
#define OUTCOME_V2 (QUICKCPPLIB_BIND_NAMESPACE_VERSION(outcome_v2))
#ifdef _DEBUG
#define OUTCOME_V2_CXX_MODULE_NAME QUICKCPPLIB_BIND_NAMESPACE((QUICKCPPLIB_BIND_NAMESPACE_VERSION(outcome_v2d)))
Expand Down Expand Up @@ -2877,11 +2877,11 @@ namespace detail
bool all_good{false};
~_()
{
if(!all_good)
if(!this->all_good)
{
// We lost one of the values
a.set_have_lost_consistency(true);
b.set_have_lost_consistency(true);
this->a.set_have_lost_consistency(true);
this->b.set_have_lost_consistency(true);
}
}
} _{_status, o._status};
Expand All @@ -2898,11 +2898,11 @@ namespace detail
bool all_good{false};
~_()
{
if(!all_good)
if(!this->all_good)
{
// We lost one of the values
a.set_have_lost_consistency(true);
b.set_have_lost_consistency(true);
this->a.set_have_lost_consistency(true);
this->b.set_have_lost_consistency(true);
}
}
} _{_status, o._status};
Expand Down Expand Up @@ -2964,11 +2964,11 @@ namespace detail
bool all_good{true};
~_()
{
if(!all_good)
if(!this->all_good)
{
// We lost one of the values
a.set_have_lost_consistency(true);
b.set_have_lost_consistency(true);
this->a.set_have_lost_consistency(true);
this->b.set_have_lost_consistency(true);
}
}
} _{_status, o._status, &_value, &o._value, &_error, &o._error};
Expand Down Expand Up @@ -5873,25 +5873,25 @@ SIGNATURE NOT RECOGNISED
bool all_good{false};
~_()
{
if(!all_good)
if(!this->all_good)
{
// We lost one of the values
a._state._status.set_have_lost_consistency(true);
b._state._status.set_have_lost_consistency(true);
this->a._state._status.set_have_lost_consistency(true);
this->b._state._status.set_have_lost_consistency(true);
return;
}
if(exceptioned)
if(this->exceptioned)
{
// The value + error swap threw an exception. Try to swap back _ptr
try
{
strong_swap(all_good, a._ptr, b._ptr);
strong_swap(this->all_good, this->a._ptr, this->b._ptr);
}
catch(...)
{
// We lost one of the values
a._state._status.set_have_lost_consistency(true);
b._state._status.set_have_lost_consistency(true);
this->a._state._status.set_have_lost_consistency(true);
this->b._state._status.set_have_lost_consistency(true);
// throw away second exception
}
// Prevent has_value() == has_error() or has_value() == has_exception()
Expand All @@ -5907,8 +5907,8 @@ SIGNATURE NOT RECOGNISED
t->_state._status.set_have_error(true).set_have_lost_consistency(true);
}
};
check(&a);
check(&b);
check(&this->a);
check(&this->b);
}
}
} _{*this, o};
Expand Down Expand Up @@ -10979,7 +10979,7 @@ namespace experimental
/*! AWAITING HUGO JSON CONVERSION TOOL
SIGNATURE NOT RECOGNISED
*/
template <class R, class S = errored_status_code<erased<typename system_code::value_type>>, class P = std::exception_ptr,
template <class R, class S = erased_errored_status_code<typename system_code::value_type>, class P = std::exception_ptr,
class NoValuePolicy = policy::default_status_outcome_policy<R, S, P>> //
using status_outcome = basic_outcome<R, S, P, NoValuePolicy>;
/*! AWAITING HUGO JSON CONVERSION TOOL
Expand Down
57 changes: 33 additions & 24 deletions single-header/outcome.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1020,9 +1020,9 @@ Distributed under the Boost Software License, Version 1.0.
http://www.boost.org/LICENSE_1_0.txt)
*/
// Note the second line of this file must ALWAYS be the git SHA, third line ALWAYS the git SHA update time
#define OUTCOME_PREVIOUS_COMMIT_REF 91dcae155b2697d9992e956e503ff07f484dddfd
#define OUTCOME_PREVIOUS_COMMIT_DATE "2023-04-18 16:46:38 +00:00"
#define OUTCOME_PREVIOUS_COMMIT_UNIQUE 91dcae15
#define OUTCOME_PREVIOUS_COMMIT_REF f3cbe84e366402a65263905c48bed1d44727da5c
#define OUTCOME_PREVIOUS_COMMIT_DATE "2023-04-27 12:49:35 +00:00"
#define OUTCOME_PREVIOUS_COMMIT_UNIQUE f3cbe84e
#define OUTCOME_V2 (QUICKCPPLIB_BIND_NAMESPACE_VERSION(outcome_v2))
#ifdef _DEBUG
#define OUTCOME_V2_CXX_MODULE_NAME QUICKCPPLIB_BIND_NAMESPACE((QUICKCPPLIB_BIND_NAMESPACE_VERSION(outcome_v2d)))
Expand Down Expand Up @@ -1772,7 +1772,16 @@ Distributed under the Boost Software License, Version 1.0.
#include <atomic>
#include <cassert>
#include <exception>
#if __cpp_impl_coroutine || (defined(_MSC_VER) && __cpp_coroutines) || (defined(__clang__) && __cpp_coroutines)
#ifndef OUTCOME_COROUTINE_HEADER_TYPE
#if __has_include(<coroutine>)
#define OUTCOME_COROUTINE_HEADER_TYPE 1
#elif __has_include(<experimental/coroutine>)
#define OUTCOME_COROUTINE_HEADER_TYPE 2
#else
#define OUTCOME_COROUTINE_HEADER_TYPE 0
#endif
#endif
#if OUTCOME_COROUTINE_HEADER_TYPE && (__cpp_impl_coroutine || (defined(_MSC_VER) && __cpp_coroutines))
#ifndef OUTCOME_HAVE_NOOP_COROUTINE
#if defined(__has_builtin)
#if __has_builtin(__builtin_coro_noop) || (!defined(__clang__) && __GNUC__ >= 10)
Expand All @@ -1787,7 +1796,7 @@ Distributed under the Boost Software License, Version 1.0.
#define OUTCOME_HAVE_NOOP_COROUTINE 0
#endif
#endif
#if __has_include(<coroutine>)
#if OUTCOME_COROUTINE_HEADER_TYPE == 1
#include <coroutine>
OUTCOME_V2_NAMESPACE_BEGIN
namespace awaitables
Expand All @@ -1802,7 +1811,7 @@ namespace awaitables
} // namespace awaitables
OUTCOME_V2_NAMESPACE_END
#define OUTCOME_FOUND_COROUTINE_HEADER 1
#elif __has_include(<experimental/coroutine>)
#elif OUTCOME_COROUTINE_HEADER_TYPE == 2
#include <experimental/coroutine>
OUTCOME_V2_NAMESPACE_BEGIN
namespace awaitables
Expand Down Expand Up @@ -3677,11 +3686,11 @@ namespace detail
bool all_good{false};
~_()
{
if(!all_good)
if(!this->all_good)
{
// We lost one of the values
a.set_have_lost_consistency(true);
b.set_have_lost_consistency(true);
this->a.set_have_lost_consistency(true);
this->b.set_have_lost_consistency(true);
}
}
} _{_status, o._status};
Expand All @@ -3698,11 +3707,11 @@ namespace detail
bool all_good{false};
~_()
{
if(!all_good)
if(!this->all_good)
{
// We lost one of the values
a.set_have_lost_consistency(true);
b.set_have_lost_consistency(true);
this->a.set_have_lost_consistency(true);
this->b.set_have_lost_consistency(true);
}
}
} _{_status, o._status};
Expand Down Expand Up @@ -3764,11 +3773,11 @@ namespace detail
bool all_good{true};
~_()
{
if(!all_good)
if(!this->all_good)
{
// We lost one of the values
a.set_have_lost_consistency(true);
b.set_have_lost_consistency(true);
this->a.set_have_lost_consistency(true);
this->b.set_have_lost_consistency(true);
}
}
} _{_status, o._status, &_value, &o._value, &_error, &o._error};
Expand Down Expand Up @@ -7271,25 +7280,25 @@ SIGNATURE NOT RECOGNISED
bool all_good{false};
~_()
{
if(!all_good)
if(!this->all_good)
{
// We lost one of the values
a._state._status.set_have_lost_consistency(true);
b._state._status.set_have_lost_consistency(true);
this->a._state._status.set_have_lost_consistency(true);
this->b._state._status.set_have_lost_consistency(true);
return;
}
if(exceptioned)
if(this->exceptioned)
{
// The value + error swap threw an exception. Try to swap back _ptr
try
{
strong_swap(all_good, a._ptr, b._ptr);
strong_swap(this->all_good, this->a._ptr, this->b._ptr);
}
catch(...)
{
// We lost one of the values
a._state._status.set_have_lost_consistency(true);
b._state._status.set_have_lost_consistency(true);
this->a._state._status.set_have_lost_consistency(true);
this->b._state._status.set_have_lost_consistency(true);
// throw away second exception
}
// Prevent has_value() == has_error() or has_value() == has_exception()
Expand All @@ -7305,8 +7314,8 @@ SIGNATURE NOT RECOGNISED
t->_state._status.set_have_error(true).set_have_lost_consistency(true);
}
};
check(&a);
check(&b);
check(&this->a);
check(&this->b);
}
}
} _{*this, o};
Expand Down

0 comments on commit 8131678

Please sign in to comment.