[libcxx] r300623 - Cleanup _LIBCPP_HAS_NO_<c++11-feature> macros for std::initializer_list
Eric Fiselier via cfe-commits
cfe-commits at lists.llvm.org
Tue Apr 18 16:09:37 PDT 2017
Author: ericwf
Date: Tue Apr 18 18:09:36 2017
New Revision: 300623
URL: http://llvm.org/viewvc/llvm-project?rev=300623&view=rev
Log:
Cleanup _LIBCPP_HAS_NO_<c++11-feature> macros for std::initializer_list
Added:
libcxx/trunk/test/std/language.support/support.initlist/include_cxx03.pass.cpp
Modified:
libcxx/trunk/include/initializer_list
libcxx/trunk/test/std/language.support/support.initlist/support.initlist.access/access.pass.cpp
libcxx/trunk/test/std/language.support/support.initlist/support.initlist.cons/default.pass.cpp
libcxx/trunk/test/std/language.support/support.initlist/support.initlist.range/begin_end.pass.cpp
libcxx/trunk/test/std/language.support/support.initlist/types.pass.cpp
Modified: libcxx/trunk/include/initializer_list
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/initializer_list?rev=300623&r1=300622&r2=300623&view=diff
==============================================================================
--- libcxx/trunk/include/initializer_list (original)
+++ libcxx/trunk/include/initializer_list Tue Apr 18 18:09:36 2017
@@ -53,7 +53,7 @@ template<class E> const E* end(initializ
namespace std // purposefully not versioned
{
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
+#ifndef _LIBCPP_CXX03_LANG
template<class _Ep>
class _LIBCPP_TEMPLATE_VIS initializer_list
@@ -111,7 +111,7 @@ end(initializer_list<_Ep> __il) _NOEXCEP
return __il.end();
}
-#endif // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
+#endif // !defined(_LIBCPP_CXX03_LANG)
} // std
Added: libcxx/trunk/test/std/language.support/support.initlist/include_cxx03.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/language.support/support.initlist/include_cxx03.pass.cpp?rev=300623&view=auto
==============================================================================
--- libcxx/trunk/test/std/language.support/support.initlist/include_cxx03.pass.cpp (added)
+++ libcxx/trunk/test/std/language.support/support.initlist/include_cxx03.pass.cpp Tue Apr 18 18:09:36 2017
@@ -0,0 +1,18 @@
+//===----------------------------------------------------------------------===//
+//
+// 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.
+//
+//===----------------------------------------------------------------------===//
+
+// <initializer_list>
+
+// Test that the file can be included in C++03
+
+#include <initializer_list>
+
+int main()
+{
+}
Modified: libcxx/trunk/test/std/language.support/support.initlist/support.initlist.access/access.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/language.support/support.initlist/support.initlist.access/access.pass.cpp?rev=300623&r1=300622&r2=300623&view=diff
==============================================================================
--- libcxx/trunk/test/std/language.support/support.initlist/support.initlist.access/access.pass.cpp (original)
+++ libcxx/trunk/test/std/language.support/support.initlist/support.initlist.access/access.pass.cpp Tue Apr 18 18:09:36 2017
@@ -7,6 +7,8 @@
//
//===----------------------------------------------------------------------===//
+// UNSUPPORTED: c++98, c++03
+
// template<class E> class initializer_list;
// const E* begin() const;
@@ -19,8 +21,6 @@
#include "test_macros.h"
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
struct A
{
A(std::initializer_list<int> il)
@@ -52,13 +52,9 @@ struct B
#endif // TEST_STD_VER > 11
-#endif // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
int main()
{
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
A test1 = {3, 2, 1};
-#endif
#if TEST_STD_VER > 11
constexpr B test2 = {3, 2, 1};
#endif // TEST_STD_VER > 11
Modified: libcxx/trunk/test/std/language.support/support.initlist/support.initlist.cons/default.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/language.support/support.initlist/support.initlist.cons/default.pass.cpp?rev=300623&r1=300622&r2=300623&view=diff
==============================================================================
--- libcxx/trunk/test/std/language.support/support.initlist/support.initlist.cons/default.pass.cpp (original)
+++ libcxx/trunk/test/std/language.support/support.initlist/support.initlist.cons/default.pass.cpp Tue Apr 18 18:09:36 2017
@@ -7,6 +7,8 @@
//
//===----------------------------------------------------------------------===//
+// UNSUPPORTED: c++98, c++03
+
// template<class E> class initializer_list;
// initializer_list();
@@ -20,10 +22,9 @@ struct A {};
int main()
{
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
std::initializer_list<A> il;
assert(il.size() == 0);
-#endif // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
+
#if TEST_STD_VER > 11
constexpr std::initializer_list<A> il2;
static_assert(il2.size() == 0, "");
Modified: libcxx/trunk/test/std/language.support/support.initlist/support.initlist.range/begin_end.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/language.support/support.initlist/support.initlist.range/begin_end.pass.cpp?rev=300623&r1=300622&r2=300623&view=diff
==============================================================================
--- libcxx/trunk/test/std/language.support/support.initlist/support.initlist.range/begin_end.pass.cpp (original)
+++ libcxx/trunk/test/std/language.support/support.initlist/support.initlist.range/begin_end.pass.cpp Tue Apr 18 18:09:36 2017
@@ -7,6 +7,8 @@
//
//===----------------------------------------------------------------------===//
+// UNSUPPORTED: c++98, c++03
+
// <initializer_list>
// template<class E> const E* begin(initializer_list<E> il);
@@ -17,8 +19,6 @@
#include "test_macros.h"
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
struct A
{
A(std::initializer_list<int> il)
@@ -49,13 +49,10 @@ struct B
};
#endif // TEST_STD_VER > 11
-#endif // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
int main()
{
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
A test1 = {3, 2, 1};
-#endif
#if TEST_STD_VER > 11
constexpr B test2 = {3, 2, 1};
#endif // TEST_STD_VER > 11
Modified: libcxx/trunk/test/std/language.support/support.initlist/types.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/language.support/support.initlist/types.pass.cpp?rev=300623&r1=300622&r2=300623&view=diff
==============================================================================
--- libcxx/trunk/test/std/language.support/support.initlist/types.pass.cpp (original)
+++ libcxx/trunk/test/std/language.support/support.initlist/types.pass.cpp Tue Apr 18 18:09:36 2017
@@ -7,6 +7,8 @@
//
//===----------------------------------------------------------------------===//
+// UNSUPPORTED: c++98, c++03
+
// template<class E>
// class initializer_list
// {
@@ -26,12 +28,10 @@ struct A {};
int main()
{
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
static_assert((std::is_same<std::initializer_list<A>::value_type, A>::value), "");
static_assert((std::is_same<std::initializer_list<A>::reference, const A&>::value), "");
static_assert((std::is_same<std::initializer_list<A>::const_reference, const A&>::value), "");
static_assert((std::is_same<std::initializer_list<A>::size_type, std::size_t>::value), "");
static_assert((std::is_same<std::initializer_list<A>::iterator, const A*>::value), "");
static_assert((std::is_same<std::initializer_list<A>::const_iterator, const A*>::value), "");
-#endif // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
}
More information about the cfe-commits
mailing list