Index: libcxx/trunk/include/__functional_base =================================================================== --- libcxx/trunk/include/__functional_base +++ libcxx/trunk/include/__functional_base @@ -558,7 +558,7 @@ // allocator_arg_t -struct _LIBCPP_TEMPLATE_VIS allocator_arg_t { }; +struct _LIBCPP_TEMPLATE_VIS allocator_arg_t { explicit allocator_arg_t() = default; }; #if defined(_LIBCPP_CXX03_LANG) || defined(_LIBCPP_BUILDING_LIBRARY) extern _LIBCPP_EXPORTED_FROM_ABI const allocator_arg_t allocator_arg; Index: libcxx/trunk/include/__mutex_base =================================================================== --- libcxx/trunk/include/__mutex_base +++ libcxx/trunk/include/__mutex_base @@ -66,9 +66,9 @@ static_assert(is_nothrow_default_constructible::value, "the default constructor for std::mutex must be nothrow"); -struct _LIBCPP_TYPE_VIS defer_lock_t {}; -struct _LIBCPP_TYPE_VIS try_to_lock_t {}; -struct _LIBCPP_TYPE_VIS adopt_lock_t {}; +struct _LIBCPP_TYPE_VIS defer_lock_t { explicit defer_lock_t() = default; }; +struct _LIBCPP_TYPE_VIS try_to_lock_t { explicit try_to_lock_t() = default; }; +struct _LIBCPP_TYPE_VIS adopt_lock_t { explicit adopt_lock_t() = default; }; #if defined(_LIBCPP_CXX03_LANG) || defined(_LIBCPP_BUILDING_LIBRARY) Index: libcxx/trunk/include/mutex =================================================================== --- libcxx/trunk/include/mutex +++ libcxx/trunk/include/mutex @@ -86,9 +86,9 @@ void unlock(); }; -struct defer_lock_t {}; -struct try_to_lock_t {}; -struct adopt_lock_t {}; +struct defer_lock_t { explicit defer_lock_t() = default; }; +struct try_to_lock_t { explicit try_to_lock_t() = default; }; +struct adopt_lock_t { explicit adopt_lock_t() = default; }; inline constexpr defer_lock_t defer_lock{}; inline constexpr try_to_lock_t try_to_lock{}; Index: libcxx/trunk/include/new =================================================================== --- libcxx/trunk/include/new +++ libcxx/trunk/include/new @@ -39,7 +39,7 @@ }; inline constexpr destroying_delete_t destroying_delete{}; // C++20 -struct nothrow_t {}; +struct nothrow_t { explicit nothrow_t() = default; }; extern const nothrow_t nothrow; typedef void (*new_handler)(); new_handler set_new_handler(new_handler new_p) noexcept; @@ -126,7 +126,7 @@ { #if !defined(_LIBCPP_ABI_VCRUNTIME) -struct _LIBCPP_TYPE_VIS nothrow_t {}; +struct _LIBCPP_TYPE_VIS nothrow_t { explicit nothrow_t() = default; }; extern _LIBCPP_FUNC_VIS const nothrow_t nothrow; class _LIBCPP_EXCEPTION_ABI bad_alloc Index: libcxx/trunk/include/tuple =================================================================== --- libcxx/trunk/include/tuple +++ libcxx/trunk/include/tuple @@ -19,7 +19,7 @@ template class tuple { public: - constexpr tuple(); + explicit(see-below) constexpr tuple(); explicit(see-below) tuple(const T&...); // constexpr in C++14 template explicit(see-below) tuple(U&&...); // constexpr in C++14 @@ -500,8 +500,19 @@ struct _CheckArgsConstructor { template - static constexpr bool __enable_default() { - return __all::value...>::value; + static constexpr bool __enable_implicit_default() { + // In C++03, there's no way to implement the resolution of LWG2510. +#ifdef _LIBCPP_CXX03_LANG + return true; +#else + return __all<__is_implicitly_default_constructible<_Args>::value...>::value; +#endif + } + + template + static constexpr bool __enable_explicit_default() { + return __all::value...>::value + && !__enable_implicit_default<_Args...>(); } template @@ -641,11 +652,18 @@ const typename tuple_element<_Jp, tuple<_Up...> >::type&& get(const tuple<_Up...>&&) _NOEXCEPT; public: - template ::template __enable_default<_Tp...>() - >::type> - _LIBCPP_INLINE_VISIBILITY - _LIBCPP_CONSTEXPR tuple() + template ::template __enable_implicit_default<_Tp...>() + , void*> = nullptr> + _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR + tuple() + _NOEXCEPT_(__all::value...>::value) {} + + template ::template __enable_explicit_default<_Tp...>() + , void*> = nullptr> + explicit _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR + tuple() _NOEXCEPT_(__all::value...>::value) {} tuple(tuple const&) = default; Index: libcxx/trunk/include/type_traits =================================================================== --- libcxx/trunk/include/type_traits +++ libcxx/trunk/include/type_traits @@ -2807,6 +2807,30 @@ = is_default_constructible<_Tp>::value; #endif +#ifndef _LIBCPP_CXX03_LANG +// First of all, we can't implement this check in C++03 mode because the {} +// default initialization syntax isn't valid. +// Second, we implement the trait in a funny manner with two defaulted template +// arguments to workaround Clang's PR43454. +template +void __test_implicit_default_constructible(_Tp); + +template ::value> +struct __is_implicitly_default_constructible + : false_type +{ }; + +template +struct __is_implicitly_default_constructible<_Tp, decltype(__test_implicit_default_constructible<_Tp const&>({})), true> + : true_type +{ }; + +template +struct __is_implicitly_default_constructible<_Tp, decltype(__test_implicit_default_constructible<_Tp const&>({})), false> + : false_type +{ }; +#endif // !C++03 + // is_copy_constructible template Index: libcxx/trunk/include/utility =================================================================== --- libcxx/trunk/include/utility +++ libcxx/trunk/include/utility @@ -69,7 +69,7 @@ pair(const pair&) = default; pair(pair&&) = default; - constexpr pair(); + explicit(see-below) constexpr pair(); explicit(see-below) pair(const T1& x, const T2& y); // constexpr in C++14 template explicit(see-below) pair(U&& x, V&& y); // constexpr in C++14 template explicit(see-below) pair(const pair& p); // constexpr in C++14 @@ -99,7 +99,7 @@ void swap(pair& x, pair& y) noexcept(noexcept(x.swap(y))); -struct piecewise_construct_t { }; +struct piecewise_construct_t { explicit piecewise_construct_t() = default; }; inline constexpr piecewise_construct_t piecewise_construct = piecewise_construct_t(); template struct tuple_size; @@ -276,7 +276,7 @@ template void as_const(const _Tp&&) = delete; #endif -struct _LIBCPP_TEMPLATE_VIS piecewise_construct_t { }; +struct _LIBCPP_TEMPLATE_VIS piecewise_construct_t { explicit piecewise_construct_t() = default; }; #if defined(_LIBCPP_CXX03_LANG) || defined(_LIBCPP_BUILDING_LIBRARY) extern _LIBCPP_EXPORTED_FROM_ABI const piecewise_construct_t piecewise_construct;// = piecewise_construct_t(); #else @@ -335,9 +335,21 @@ struct _CheckArgs { template - static constexpr bool __enable_default() { + static constexpr bool __enable_explicit_default() { return is_default_constructible<_U1>::value - && is_default_constructible<_U2>::value; + && is_default_constructible<_U2>::value + && !__enable_implicit_default<_U1, _U2>(); + } + + template + static constexpr bool __enable_implicit_default() { + // In C++03, there's no way to implement the resolution of LWG2510. +#ifdef _LIBCPP_CXX03_LANG + return true; +#else + return __is_implicitly_default_constructible<_U1>::value + && __is_implicitly_default_constructible<_U2>::value; +#endif } template @@ -388,7 +400,15 @@ >::type; template::template __enable_default<_T1, _T2>() + _CheckArgsDep<_Dummy>::template __enable_explicit_default<_T1, _T2>() + > = false> + explicit _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR + pair() _NOEXCEPT_(is_nothrow_default_constructible::value && + is_nothrow_default_constructible::value) + : first(), second() {} + + template::template __enable_implicit_default<_T1, _T2>() > = false> _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR pair() _NOEXCEPT_(is_nothrow_default_constructible::value && Index: libcxx/trunk/src/mutex.cpp =================================================================== --- libcxx/trunk/src/mutex.cpp +++ libcxx/trunk/src/mutex.cpp @@ -21,9 +21,9 @@ _LIBCPP_BEGIN_NAMESPACE_STD #ifndef _LIBCPP_HAS_NO_THREADS -const defer_lock_t defer_lock = {}; -const try_to_lock_t try_to_lock = {}; -const adopt_lock_t adopt_lock = {}; +const defer_lock_t defer_lock{}; +const try_to_lock_t try_to_lock{}; +const adopt_lock_t adopt_lock{}; // ~mutex is defined elsewhere Index: libcxx/trunk/src/utility.cpp =================================================================== --- libcxx/trunk/src/utility.cpp +++ libcxx/trunk/src/utility.cpp @@ -10,6 +10,6 @@ _LIBCPP_BEGIN_NAMESPACE_STD -const piecewise_construct_t piecewise_construct = {}; +const piecewise_construct_t piecewise_construct{}; _LIBCPP_END_NAMESPACE_STD Index: libcxx/trunk/test/libcxx/type_traits/is_implicitly_default_constructible.pass.cpp =================================================================== --- libcxx/trunk/test/libcxx/type_traits/is_implicitly_default_constructible.pass.cpp +++ libcxx/trunk/test/libcxx/type_traits/is_implicitly_default_constructible.pass.cpp @@ -0,0 +1,85 @@ +//===----------------------------------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +// UNSUPPORTED: c++98, c++03 + +// Before GCC 6, this trait fails. See https://stackoverflow.com/q/41799015/627587. +// UNSUPPORTED: gcc-5 + +// + +// __is_implicitly_default_constructible + +#include + + +struct ExplicitlyDefaultConstructible1 { + explicit ExplicitlyDefaultConstructible1() = default; +}; + +struct ExplicitlyDefaultConstructible2 { + explicit ExplicitlyDefaultConstructible2() { } +}; + +struct ImplicitlyDefaultConstructible1 { + ImplicitlyDefaultConstructible1() { } +}; + +struct ImplicitlyDefaultConstructible2 { + ImplicitlyDefaultConstructible2() = default; +}; + +struct NonDefaultConstructible1 { + NonDefaultConstructible1() = delete; +}; + +struct NonDefaultConstructible2 { + explicit NonDefaultConstructible2() = delete; +}; + +struct NonDefaultConstructible3 { + NonDefaultConstructible3(NonDefaultConstructible3&&) { } +}; + +struct ProtectedDefaultConstructible { +protected: + ProtectedDefaultConstructible() = default; +}; + +struct PrivateDefaultConstructible { +private: + PrivateDefaultConstructible() = default; +}; + +struct Base { }; + +struct ProtectedDefaultConstructibleWithBase : Base { +protected: + ProtectedDefaultConstructibleWithBase() = default; +}; + +struct PrivateDefaultConstructibleWithBase : Base { +private: + PrivateDefaultConstructibleWithBase() = default; +}; + +static_assert(!std::__is_implicitly_default_constructible::value, ""); +static_assert(!std::__is_implicitly_default_constructible::value, ""); +static_assert(std::__is_implicitly_default_constructible::value, ""); +static_assert(std::__is_implicitly_default_constructible::value, ""); +static_assert(!std::__is_implicitly_default_constructible::value, ""); +static_assert(!std::__is_implicitly_default_constructible::value, ""); +static_assert(!std::__is_implicitly_default_constructible::value, ""); +static_assert(!std::__is_implicitly_default_constructible::value, ""); +static_assert(!std::__is_implicitly_default_constructible::value, ""); +static_assert(!std::__is_implicitly_default_constructible::value, ""); +static_assert(!std::__is_implicitly_default_constructible::value, ""); + +int main(int, char**) { + return 0; +} Index: libcxx/trunk/test/std/language.support/support.dynamic/nothrow_t.fail.cpp =================================================================== --- libcxx/trunk/test/std/language.support/support.dynamic/nothrow_t.fail.cpp +++ libcxx/trunk/test/std/language.support/support.dynamic/nothrow_t.fail.cpp @@ -0,0 +1,30 @@ +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is dual licensed under the MIT and the University of Illinois Open +// Source Licenses. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// UNSUPPORTED: c++98, c++03 + +// Before GCC 6, aggregate initialization kicks in. +// See https://stackoverflow.com/q/41799015/627587. +// UNSUPPORTED: gcc-5 + +// struct nothrow_t { +// explicit nothrow_t() = default; +// }; +// extern const nothrow_t nothrow; + +// This test checks for LWG 2510. + +#include + + +std::nothrow_t f() { return {}; } // expected-error 1 {{chosen constructor is explicit in copy-initialization}} + +int main(int, char**) { + return 0; +} Index: libcxx/trunk/test/std/language.support/support.dynamic/nothrow_t.pass.cpp =================================================================== --- libcxx/trunk/test/std/language.support/support.dynamic/nothrow_t.pass.cpp +++ libcxx/trunk/test/std/language.support/support.dynamic/nothrow_t.pass.cpp @@ -0,0 +1,23 @@ +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is dual licensed under the MIT and the University of Illinois Open +// Source Licenses. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// struct nothrow_t { +// explicit nothrow_t() = default; +// }; +// extern const nothrow_t nothrow; + +#include + + +int main(int, char**) { + std::nothrow_t x = std::nothrow; + (void)x; + + return 0; +} Index: libcxx/trunk/test/std/thread/thread.mutex/thread.lock/types.fail.cpp =================================================================== --- libcxx/trunk/test/std/thread/thread.mutex/thread.lock/types.fail.cpp +++ libcxx/trunk/test/std/thread/thread.mutex/thread.lock/types.fail.cpp @@ -0,0 +1,34 @@ +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is dual licensed under the MIT and the University of Illinois Open +// Source Licenses. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// UNSUPPORTED: c++98, c++03 +// UNSUPPORTED: libcpp-has-no-threads + +// Before GCC 6, aggregate initialization kicks in. +// See https://stackoverflow.com/q/41799015/627587. +// UNSUPPORTED: gcc-5 + +// + +// struct defer_lock_t { explicit defer_lock_t() = default; }; +// struct try_to_lock_t { explicit try_to_lock_t() = default; }; +// struct adopt_lock_t { explicit adopt_lock_t() = default; }; + +// This test checks for LWG 2510. + +#include + + +std::defer_lock_t f1() { return {}; } // expected-error 1 {{chosen constructor is explicit in copy-initialization}} +std::try_to_lock_t f2() { return {}; } // expected-error 1 {{chosen constructor is explicit in copy-initialization}} +std::adopt_lock_t f3() { return {}; } // expected-error 1 {{chosen constructor is explicit in copy-initialization}} + +int main(int, char**) { + return 0; +} Index: libcxx/trunk/test/std/thread/thread.mutex/thread.lock/types.pass.cpp =================================================================== --- libcxx/trunk/test/std/thread/thread.mutex/thread.lock/types.pass.cpp +++ libcxx/trunk/test/std/thread/thread.mutex/thread.lock/types.pass.cpp @@ -10,16 +10,15 @@ // -// struct defer_lock_t {}; -// struct try_to_lock_t {}; -// struct adopt_lock_t {}; +// struct defer_lock_t { explicit defer_lock_t() = default; }; +// struct try_to_lock_t { explicit try_to_lock_t() = default; }; +// struct adopt_lock_t { explicit adopt_lock_t() = default; }; // // constexpr defer_lock_t defer_lock{}; // constexpr try_to_lock_t try_to_lock{}; // constexpr adopt_lock_t adopt_lock{}; #include -#include #include "test_macros.h" @@ -33,5 +32,5 @@ T2 t2 = std::try_to_lock; ((void)t2); T3 t3 = std::adopt_lock; ((void)t3); - return 0; + return 0; } Index: libcxx/trunk/test/std/utilities/memory/allocator.tag/allocator_arg.fail.cpp =================================================================== --- libcxx/trunk/test/std/utilities/memory/allocator.tag/allocator_arg.fail.cpp +++ libcxx/trunk/test/std/utilities/memory/allocator.tag/allocator_arg.fail.cpp @@ -0,0 +1,29 @@ +//===----------------------------------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +// UNSUPPORTED: c++98, c++03 + +// Before GCC 6, aggregate initialization kicks in. +// See https://stackoverflow.com/q/41799015/627587. +// UNSUPPORTED: gcc-5 + +// + +// struct allocator_arg_t { explicit allocator_arg_t() = default; }; +// const allocator_arg_t allocator_arg = allocator_arg_t(); + +// This test checks for LWG 2510. + +#include + + +std::allocator_arg_t f() { return {}; } // expected-error 1 {{chosen constructor is explicit in copy-initialization}} + +int main(int, char**) { + return 0; +} Index: libcxx/trunk/test/std/utilities/memory/allocator.tag/allocator_arg.pass.cpp =================================================================== --- libcxx/trunk/test/std/utilities/memory/allocator.tag/allocator_arg.pass.cpp +++ libcxx/trunk/test/std/utilities/memory/allocator.tag/allocator_arg.pass.cpp @@ -8,7 +8,7 @@ // -// struct allocator_arg_t { }; +// struct allocator_arg_t { explicit allocator_arg_t() = default; }; // const allocator_arg_t allocator_arg = allocator_arg_t(); #include @@ -21,5 +21,5 @@ { test(std::allocator_arg); - return 0; + return 0; } Index: libcxx/trunk/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/default.fail.cpp =================================================================== --- libcxx/trunk/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/default.fail.cpp +++ libcxx/trunk/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/default.fail.cpp @@ -0,0 +1,53 @@ +//===----------------------------------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +// UNSUPPORTED: c++98, c++03 + +// Before GCC 6, aggregate initialization kicks in. +// See https://stackoverflow.com/q/41799015/627587. +// UNSUPPORTED: gcc-5 + +// + +// template class tuple; + +// explicit(see-below) constexpr tuple(); + +#include + + +struct Implicit { + Implicit() = default; +}; + +struct Explicit { + explicit Explicit() = default; +}; + +std::tuple<> test1() { return {}; } + +std::tuple test2() { return {}; } +std::tuple test3() { return {}; } // expected-error 1 {{chosen constructor is explicit in copy-initialization}} + +std::tuple test4() { return {}; } +std::tuple test5() { return {}; } // expected-error 1 {{chosen constructor is explicit in copy-initialization}} +std::tuple test6() { return {}; } // expected-error 1 {{chosen constructor is explicit in copy-initialization}} +std::tuple test7() { return {}; } // expected-error 1 {{chosen constructor is explicit in copy-initialization}} + +std::tuple test8() { return {}; } +std::tuple test9() { return {}; } // expected-error 1 {{chosen constructor is explicit in copy-initialization}} +std::tuple test10() { return {}; } // expected-error 1 {{chosen constructor is explicit in copy-initialization}} +std::tuple test11() { return {}; } // expected-error 1 {{chosen constructor is explicit in copy-initialization}} +std::tuple test12() { return {}; } // expected-error 1 {{chosen constructor is explicit in copy-initialization}} +std::tuple test13() { return {}; } // expected-error 1 {{chosen constructor is explicit in copy-initialization}} +std::tuple test14() { return {}; } // expected-error 1 {{chosen constructor is explicit in copy-initialization}} +std::tuple test15() { return {}; } // expected-error 1 {{chosen constructor is explicit in copy-initialization}} + +int main(int, char**) { + return 0; +} Index: libcxx/trunk/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/default.pass.cpp =================================================================== --- libcxx/trunk/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/default.pass.cpp +++ libcxx/trunk/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/default.pass.cpp @@ -10,7 +10,7 @@ // template class tuple; -// constexpr tuple(); +// explicit(see-below) constexpr tuple(); // UNSUPPORTED: c++98, c++03 @@ -107,6 +107,11 @@ IllFormedDefault v(0); std::tuple t(v); } + { + struct Base { }; + struct Derived : Base { protected: Derived() = default; }; + static_assert(!std::is_default_constructible >::value, ""); + } - return 0; + return 0; } Index: libcxx/trunk/test/std/utilities/utility/pairs/pair.piecewise/piecewise_construct.pass.cpp =================================================================== --- libcxx/trunk/test/std/utilities/utility/pairs/pair.piecewise/piecewise_construct.pass.cpp +++ libcxx/trunk/test/std/utilities/utility/pairs/pair.piecewise/piecewise_construct.pass.cpp @@ -12,7 +12,7 @@ // template struct pair -// struct piecewise_construct_t { }; +// struct piecewise_construct_t { explicit piecewise_construct_t() = default; }; // constexpr piecewise_construct_t piecewise_construct = piecewise_construct_t(); #include Index: libcxx/trunk/test/std/utilities/utility/pairs/pair.piecewise/piecewise_construct_t.fail.cpp =================================================================== --- libcxx/trunk/test/std/utilities/utility/pairs/pair.piecewise/piecewise_construct_t.fail.cpp +++ libcxx/trunk/test/std/utilities/utility/pairs/pair.piecewise/piecewise_construct_t.fail.cpp @@ -0,0 +1,29 @@ +//===----------------------------------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +// UNSUPPORTED: c++98, c++03 + +// Before GCC 6, aggregate initialization kicks in. +// See https://stackoverflow.com/q/41799015/627587. +// UNSUPPORTED: gcc-5 + +// + +// struct piecewise_construct_t { explicit piecewise_construct_t() = default; }; +// constexpr piecewise_construct_t piecewise_construct = piecewise_construct_t(); + +// This test checks for LWG 2510. + +#include + + +std::piecewise_construct_t f() { return {}; } // expected-error 1 {{chosen constructor is explicit in copy-initialization}} + +int main(int, char**) { + return 0; +} Index: libcxx/trunk/test/std/utilities/utility/pairs/pair.piecewise/piecewise_construct_t.pass.cpp =================================================================== --- libcxx/trunk/test/std/utilities/utility/pairs/pair.piecewise/piecewise_construct_t.pass.cpp +++ libcxx/trunk/test/std/utilities/utility/pairs/pair.piecewise/piecewise_construct_t.pass.cpp @@ -0,0 +1,24 @@ +//===----------------------------------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +// UNSUPPORTED: c++98, c++03 + +// + +// struct piecewise_construct_t { explicit piecewise_construct_t() = default; }; +// constexpr piecewise_construct_t piecewise_construct = piecewise_construct_t(); + +#include + + +int main(int, char**) { + std::piecewise_construct_t x = std::piecewise_construct; + (void)x; + + return 0; +} Index: libcxx/trunk/test/std/utilities/utility/pairs/pairs.pair/default.explicit.fail.cpp =================================================================== --- libcxx/trunk/test/std/utilities/utility/pairs/pairs.pair/default.explicit.fail.cpp +++ libcxx/trunk/test/std/utilities/utility/pairs/pairs.pair/default.explicit.fail.cpp @@ -0,0 +1,42 @@ +//===----------------------------------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +// UNSUPPORTED: c++98, c++03 + +// Before GCC 6, aggregate initialization kicks in. +// See https://stackoverflow.com/q/41799015/627587. +// UNSUPPORTED: gcc-5 + +// + +// template struct pair + +// explicit(see-below) constexpr pair(); + +// This test checks the conditional explicitness of std::pair's default +// constructor as introduced by the resolution of LWG 2510. + +#include + + +struct ImplicitlyDefaultConstructible { + ImplicitlyDefaultConstructible() = default; +}; + +struct ExplicitlyDefaultConstructible { + explicit ExplicitlyDefaultConstructible() = default; +}; + +std::pair test1() { return {}; } // expected-error 1 {{chosen constructor is explicit in copy-initialization}} +std::pair test2() { return {}; } // expected-error 1 {{chosen constructor is explicit in copy-initialization}} +std::pair test3() { return {}; } // expected-error 1 {{chosen constructor is explicit in copy-initialization}} +std::pair test4() { return {}; } + +int main(int, char**) { + return 0; +} Index: libcxx/trunk/test/std/utilities/utility/pairs/pairs.pair/default.pass.cpp =================================================================== --- libcxx/trunk/test/std/utilities/utility/pairs/pairs.pair/default.pass.cpp +++ libcxx/trunk/test/std/utilities/utility/pairs/pairs.pair/default.pass.cpp @@ -10,7 +10,7 @@ // template struct pair -// constexpr pair(); +// explicit(see-below) constexpr pair(); // NOTE: The SFINAE on the default constructor is tested in // default-sfinae.pass.cpp @@ -45,6 +45,11 @@ using P2 = std::pair; static_assert(!std::is_default_constructible::value, ""); } + { + struct Base { }; + struct Derived : Base { protected: Derived() = default; }; + static_assert(!std::is_default_constructible >::value, ""); + } #endif return 0; Index: libcxx/trunk/www/cxx1z_status.html =================================================================== --- libcxx/trunk/www/cxx1z_status.html +++ libcxx/trunk/www/cxx1z_status.html @@ -372,7 +372,7 @@ 2468Self-move-assignment of library typesIssaquah 2475Allow overwriting of std::basic_string terminator with charT() to allow cleaner interoperation with legacy APIsIssaquahComplete 2503multiline option should be added to syntax_option_typeIssaquah - 2510Tag types should not be DefaultConstructibleIssaquah + 2510Tag types should not be DefaultConstructibleIssaquahComplete 2514Type traits must not be finalIssaquahComplete 2518[fund.ts.v2] Non-member swap for propagate_const should call member swapIssaquahComplete 2519Iterator operator-= has gratuitous undefined behaviourIssaquahComplete