[cfe-commits] [libcxx] r119906 - in /libcxx/trunk: include/__config include/__tuple include/type_traits test/utilities/meta/meta.trans/meta.trans.other/result_of.pass.cpp

[Howard Hinnant]

Author: hhinnant
Date: Sat Nov 20 12:25:22 2010
New Revision: 119906

URL: http://llvm.org/viewvc/llvm-project?rev=119906&view=rev
Log:
N3123

Modified:
    libcxx/trunk/include/__config
    libcxx/trunk/include/__tuple
    libcxx/trunk/include/type_traits
    libcxx/trunk/test/utilities/meta/meta.trans/meta.trans.other/result_of.pass.cpp

Modified: libcxx/trunk/include/__config
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/__config?rev=119906&r1=119905&r2=119906&view=diff
==============================================================================
--- libcxx/trunk/include/__config (original)
+++ libcxx/trunk/include/__config Sat Nov 20 12:25:22 2010
@@ -86,8 +86,6 @@
 
 #if defined(__clang__)
 
-#undef __STRICT_ANSI__
-
 #define _LIBCPP_HAS_NO_ADVANCED_SFINAE
 #define _LIBCPP_HAS_NO_TEMPLATE_ALIASES
 

Modified: libcxx/trunk/include/__tuple
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/__tuple?rev=119906&r1=119905&r2=119906&view=diff
==============================================================================
--- libcxx/trunk/include/__tuple (original)
+++ libcxx/trunk/include/__tuple Sat Nov 20 12:25:22 2010
@@ -240,7 +240,7 @@
 template <class _Tp0, class ..._Tp, class _Up0, class ..._Up>
 struct __tuple_assignable_imp<true, __tuple_types<_Tp0, _Tp...>, __tuple_types<_Up0, _Up...>>
     : public integral_constant<bool,
-                               __is_assignable<_Up0&, _Tp0>::value &&
+                               is_assignable<_Up0&, _Tp0>::value &&
                                __tuple_assignable_imp<true, __tuple_types<_Tp...>, __tuple_types<_Up...>>::value> {};
 
 template <>

Modified: libcxx/trunk/include/type_traits
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/type_traits?rev=119906&r1=119905&r2=119906&view=diff
==============================================================================
--- libcxx/trunk/include/type_traits (original)
+++ libcxx/trunk/include/type_traits Sat Nov 20 12:25:22 2010
@@ -1394,8 +1394,6 @@
     typedef decltype(declval<_Fn>()(declval<_ArgTypes>()...)) type;
 };
 
-#if 0
-
 template <class _MP, class _Tp, class ..._Args>
 struct __result_of_mp;
 
@@ -1455,8 +1453,6 @@
 {
 };
 
-#endif  // 0
-
 // result_of
 
 template <class _Fn, class ..._ArgTypes>

Modified: libcxx/trunk/test/utilities/meta/meta.trans/meta.trans.other/result_of.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/meta/meta.trans/meta.trans.other/result_of.pass.cpp?rev=119906&r1=119905&r2=119906&view=diff
==============================================================================
--- libcxx/trunk/test/utilities/meta/meta.trans/meta.trans.other/result_of.pass.cpp (original)
+++ libcxx/trunk/test/utilities/meta/meta.trans/meta.trans.other/result_of.pass.cpp Sat Nov 20 12:25:22 2010
@@ -33,7 +33,7 @@
     static_assert((std::is_same<std::result_of<S(int)>::type, short>::value), "Error!");
     static_assert((std::is_same<std::result_of<S&(unsigned char, int&)>::type, double>::value), "Error!");
     static_assert((std::is_same<std::result_of<PF1()>::type, bool>::value), "Error!");
-//     static_assert(std::is_same<std::result_of<PMS(std::unique_ptr<S>, int)>::type, void>::value, "Error!");
-//     static_assert(std::is_same<std::result_of<PMD(S)>::type, char&&>::value, "Error!");
-//     static_assert(std::is_same<std::result_of<PMD(const S*)>::type, const char&>::value, "Error!");
+    static_assert((std::is_same<std::result_of<PMS(std::unique_ptr<S>, int)>::type, void>::value), "Error!");
+    static_assert((std::is_same<std::result_of<PMD(S)>::type, char&&>::value), "Error!");
+    static_assert((std::is_same<std::result_of<PMD(const S*)>::type, const char&>::value), "Error!");
 }