Re: [PATCH] [libcxx] expose experimental::erased_type for all standard versions.

[Eric Fiselier]

Update one more test. Sorry for the spam.

http://reviews.llvm.org/D4554

Files:
  include/experimental/utility
  test/experimental/utilities/utility/utility.erased.type/erased_type.pass.cpp
  test/experimental/utilities/utility/utility.synop/includes.pass.cpp

Index: include/experimental/utility
===================================================================
--- include/experimental/utility
+++ include/experimental/utility
@@ -33,16 +33,12 @@
 
 # include <experimental/__config>
 
-#if _LIBCPP_STD_VER > 11
-
 # include <utility>
 
 _LIBCPP_BEGIN_NAMESPACE_LFTS
 
   struct _LIBCPP_TYPE_VIS_ONLY erased_type { };
 
 _LIBCPP_END_NAMESPACE_LFTS
 
-#endif /* _LIBCPP_STD_VER > 11 */
-
 #endif /* _LIBCPP_EXPERIMENTAL_UTILITY */
Index: 
test/experimental/utilities/utility/utility.erased.type/erased_type.pass.cpp
===================================================================
--- test/experimental/utilities/utility/utility.erased.type/erased_type.pass.cpp
+++ 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();
 }
Index: test/experimental/utilities/utility/utility.synop/includes.pass.cpp
===================================================================
--- test/experimental/utilities/utility/utility.synop/includes.pass.cpp
+++ 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 */
 }

Index: include/experimental/utility
===================================================================
--- include/experimental/utility
+++ include/experimental/utility
@@ -33,16 +33,12 @@
 
 # include <experimental/__config>
 
-#if _LIBCPP_STD_VER > 11
-
 # include <utility>
 
 _LIBCPP_BEGIN_NAMESPACE_LFTS
 
   struct _LIBCPP_TYPE_VIS_ONLY erased_type { };
 
 _LIBCPP_END_NAMESPACE_LFTS
 
-#endif /* _LIBCPP_STD_VER > 11 */
-
 #endif /* _LIBCPP_EXPERIMENTAL_UTILITY */
Index: test/experimental/utilities/utility/utility.erased.type/erased_type.pass.cpp
===================================================================
--- test/experimental/utilities/utility/utility.erased.type/erased_type.pass.cpp
+++ 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();
 }
Index: test/experimental/utilities/utility/utility.synop/includes.pass.cpp
===================================================================
--- test/experimental/utilities/utility/utility.synop/includes.pass.cpp
+++ 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 */
 }

_______________________________________________
cfe-commits mailing list
cfe-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits