From 3ee7233c8072ef912e249e391b35168f559bb239 Mon Sep 17 00:00:00 2001
From: Eric Fiselier <eric@efcs.ca>
Date: Thu, 24 Jul 2014 19:17:38 +0000
Subject: [PATCH] [libcxx] expose experimental::erased_type for all standard
 versions.

Summary: The polymorphic allocator implementation would greatly benefit by defining virtual functions in the dynlib instead of inline. In order to do that some types are going to have to be available outside of c++1y. This is the first step.

Reviewers: mclow.lists, EricWF

Reviewed By: EricWF

Subscribers: cfe-commits

Differential Revision: http://reviews.llvm.org/D4554

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@213889 91177308-0d34-0410-b5e6-96231b3b80d8
---
 include/experimental/utility                             | 4 ----
 .../utility/utility.erased.type/erased_type.pass.cpp     | 5 +----
 .../utilities/utility/utility.synop/includes.pass.cpp    | 9 ++++-----
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/include/experimental/utility b/include/experimental/utility
index 12a7d050..84e461af 100644
--- a/include/experimental/utility
+++ b/include/experimental/utility
@@ -33,8 +33,6 @@ inline namespace fundamentals_v1 {
 
 # include <experimental/__config>
 
-#if _LIBCPP_STD_VER > 11
-
 # include <utility>
 
 _LIBCPP_BEGIN_NAMESPACE_LFTS
@@ -43,6 +41,4 @@ _LIBCPP_BEGIN_NAMESPACE_LFTS
 
 _LIBCPP_END_NAMESPACE_LFTS
 
-#endif /* _LIBCPP_STD_VER > 11 */
-
 #endif /* _LIBCPP_EXPERIMENTAL_UTILITY */
diff --git a/test/experimental/utilities/utility/utility.erased.type/erased_type.pass.cpp b/test/experimental/utilities/utility/utility.erased.type/erased_type.pass.cpp
index 5f89e536..3e38d5ec 100644
--- a/test/experimental/utilities/utility/utility.erased.type/erased_type.pass.cpp
+++ b/test/experimental/utilities/utility/utility.erased.type/erased_type.pass.cpp
@@ -13,8 +13,5 @@
 
 int main()
 {
-#if _LIBCPP_STD_VER > 11
-    using std::experimental::erased_type;
-    constexpr erased_type e{};
-#endif
+    std::experimental::erased_type e();
 }
diff --git a/test/experimental/utilities/utility/utility.synop/includes.pass.cpp b/test/experimental/utilities/utility/utility.synop/includes.pass.cpp
index bcdd8b38..2583d434 100644
--- a/test/experimental/utilities/utility/utility.synop/includes.pass.cpp
+++ b/test/experimental/utilities/utility/utility.synop/includes.pass.cpp
@@ -11,11 +11,10 @@
 
 #include <experimental/utility>
 
+#ifndef _LIBCPP_UTILITY
+#   error "<experimental/utility> must include <utility>"
+#endif
+
 int main()
 {
-#if _LIBCPP_STD_VER > 11
-# ifndef _LIBCPP_UTILITY
-#   error "<experimental/utility> must include <utility>"
-# endif
-#endif /* _LIBCPP_STD_VER > 11 */
 }