[cfe-commits] [libcxx] r123080 - in /libcxx/trunk/include: iosfwd type_traits

[Howard Hinnant]

Author: hhinnant
Date: Sat Jan  8 14:00:48 2011
New Revision: 123080

URL: http://llvm.org/viewvc/llvm-project?rev=123080&view=rev
Log:
Two minor fixes:  1.  Put integral_constant conversion to integral in even without constexpr support.  2.  Add ios_base to <iosfwd>.  The latter is being tracked by LWG 2026.

Modified:
    libcxx/trunk/include/iosfwd
    libcxx/trunk/include/type_traits

Modified: libcxx/trunk/include/iosfwd
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/iosfwd?rev=123080&r1=123079&r2=123080&view=diff
==============================================================================
--- libcxx/trunk/include/iosfwd (original)
+++ libcxx/trunk/include/iosfwd Sat Jan  8 14:00:48 2011
@@ -92,6 +92,8 @@
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 
+class ios_base;
+
 template<class _CharT>  struct _LIBCPP_VISIBLE char_traits;
 template<class _Tp>     class _LIBCPP_VISIBLE allocator;
 

Modified: libcxx/trunk/include/type_traits
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/type_traits?rev=123080&r1=123079&r2=123080&view=diff
==============================================================================
--- libcxx/trunk/include/type_traits (original)
+++ libcxx/trunk/include/type_traits Sat Jan  8 14:00:48 2011
@@ -165,10 +165,11 @@
     static constexpr _Tp      value = __v;
     typedef _Tp               value_type;
     typedef integral_constant type;
-#ifndef _LIBCPP_HAS_NO_CONSTEXPR
     _LIBCPP_INLINE_VISIBILITY
-    constexpr operator value_type() {return value;}
+#ifndef _LIBCPP_HAS_NO_CONSTEXPR
+    constexpr
 #endif
+         operator value_type() const {return value;}
 };
 
 template <class _Tp, _Tp __v>