King_DuckZ/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout synced 2025-08-03 12:49:50 +00:00
Code Issues Releases Wiki Activity

temporary workaround for old GCC

Browse source
This commit is contained in:
bolero-MURAKAMI 2018-12-25 17:11:15 +09:00
parent 8274f34db4
commit 6e8f686f72
6 changed files with 101 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

16
sprout/utility/value_holder/value_holder.hpp
View file

@ -118,9 +118,11 @@ namespace sprout {
return sprout::addressof(p);
}
static SPROUT_CONSTEXPR reference ref(holder_type r) {
return r ? *r
: (throw sprout::bad_optional_access("value_holder<>: bad optional access"), *r)
;
return *r;
// !!!
// return r ? *r
// : (throw sprout::bad_optional_access("value_holder<>: bad optional access"), *r)
// ;
}
static SPROUT_CONSTEXPR pointer ptr(holder_type r) SPROUT_NOEXCEPT {
return r;
@ -148,9 +150,11 @@ namespace sprout {
return sprout::addressof(p);
}
static SPROUT_CONSTEXPR reference ref(holder_type r) {
return r ? *r
: (throw sprout::bad_optional_access("value_holder<>: bad optional access"), *r)
;
return *r;
// !!!
// return r ? *r
// : (throw sprout::bad_optional_access("value_holder<>: bad optional access"), *r)
// ;
}
static SPROUT_CONSTEXPR pointer ptr(holder_type r) SPROUT_NOEXCEPT {
return r;