boostorg/optional
1
0
Fork 1
mirror of https://github.com/boostorg/optional.git synced 2025-07-14 21:06:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/RobertLeahy/optional-2 into RobertLeahy-develop

Browse Source
This commit is contained in:
Andrzej Krzemienski
2020-04-06 00:33:11 +02:00
parent e52d7d4a9e 9581804efa
commit 9b1f8033eb
6 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -151,6 +151,7 @@ matrix:
- llvm-toolchain-precise-3.9
- os: linux
dist: trusty
compiler: clang++-4.0
env: TOOLSET=clang COMPILER=clang++-4.0 CXXSTD=03,11,14,1z
addons:
@ -162,6 +163,7 @@ matrix:
- llvm-toolchain-trusty-4.0
- os: linux
dist: trusty
compiler: clang++-5.0
env: TOOLSET=clang COMPILER=clang++-5.0 CXXSTD=03,11,14,1z
addons:

2
include/boost/optional/detail/optional_trivially_copyable_base.hpp
View File

@ -359,7 +359,7 @@ class tc_optional_base : public optional_tag
template<class Expr>
void construct ( Expr const& factory, in_place_factory_base const* )
{
boost_optional_detail::construct<value_type>(factory, m_storage.address());
boost_optional_detail::construct<value_type>(factory, boost::addressof(m_storage));
m_initialized = true ;
}

10
test/optional_test_constructible_from_other.cpp
View File

@ -26,12 +26,14 @@ struct size_tag {};
template< typename T, typename U >
struct is_constructible
{
template< typename T1, typename U1 >
static yes_type check_helper(size_tag< sizeof(static_cast< T1 >(U1())) >*);
template< typename T1, typename U1 >
static U& get();
template< typename T1 >
static yes_type check_helper(size_tag< sizeof(static_cast< T1 >(get())) >*);
template< typename T1 >
static no_type check_helper(...);
static const bool value = sizeof(check_helper< T, U >(0)) == sizeof(yes_type);
static const bool value = sizeof(check_helper< T >(0)) == sizeof(yes_type);
};
template< typename T >

9
test/optional_test_inplace_factory.cpp
View File

@ -63,6 +63,10 @@ void test_ctor()
BOOST_TEST(og1_ == og1);
BOOST_TEST(og1_ != og2);
BOOST_TEST(og1_ != og0);
boost::optional<unsigned int> o( boost::in_place(5) );
BOOST_TEST(o);
BOOST_TEST(*o == 5);
#endif
}
@ -92,6 +96,11 @@ void test_assign()
BOOST_TEST(og1_ == og1);
BOOST_TEST(og1_ != og2);
BOOST_TEST(og1_ != og0);
boost::optional<unsigned int> o;
o = boost::in_place(5);
BOOST_TEST(o);
BOOST_TEST(*o == 5);
#endif
#endif
}

4
test/optional_test_path_assignment.cpp
View File

@ -15,6 +15,8 @@
#pragma hdrstop
#endif
#ifndef BOOST_OPTIONAL_DETAIL_NO_IS_CONSTRUCTIBLE_TRAIT
#ifndef BOOST_OPTIONAL_DETAIL_NO_SFINAE_FRIENDLY_CONSTRUCTORS
template <typename, typename>
struct void_t
{
@ -49,6 +51,8 @@ struct Path
#endif
};
#endif
#endif
int main()

2
test/optional_test_ref_converting_ctor.cpp
View File

@ -93,7 +93,9 @@ template <typename T>
void test_all_const_cases()
{
test_converting_ctor<T>();
#ifndef BOOST_OPTIONAL_CONFIG_NO_PROPER_CONVERT_FROM_CONST_INT
test_converting_ctor<const T>();
#endif
test_converting_ctor_for_noconst_const<T>();
}