Imported Upstream version 4.8.1

[platform/upstream/gcc48.git] / libstdc++-v3 / include / debug / bitset

diff --git a/libstdc++-v3/include/debug/bitset b/libstdc++-v3/include/debug/bitset
index 3d865c1..28d9184 100644 (file)
--- a/libstdc++-v3/include/debug/bitset
+++ b/libstdc++-v3/include/debug/bitset
@@ -1,7 +1,6 @@
 // Debugging bitset implementation -*- C++ -*-
 
-// Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-// Free Software Foundation, Inc.
+// Copyright (C) 2003-2013 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -42,7 +41,7 @@ namespace __debug
   template<size_t _Nb>
     class bitset
     : public _GLIBCXX_STD_C::bitset<_Nb>
-#ifndef __GXX_EXPERIMENTAL_CXX0X__
+#if __cplusplus < 201103L
     , public __gnu_debug::_Safe_sequence_base
 #endif
     {
@@ -52,7 +51,7 @@ namespace __debug
       // In C++0x we rely on normal reference type to preserve the property
       // of bitset to be use as a literal.
       // TODO: Find another solution.
-#ifdef __GXX_EXPERIMENTAL_CXX0X__
+#if __cplusplus >= 201103L
       typedef typename _Base::reference reference;
 #else
       // bit reference:
@@ -133,7 +132,7 @@ namespace __debug
       _GLIBCXX_CONSTEXPR bitset() _GLIBCXX_NOEXCEPT
       : _Base() { }
 
-#ifdef __GXX_EXPERIMENTAL_CXX0X__
+#if __cplusplus >= 201103L
       constexpr bitset(unsigned long long __val) noexcept
 #else
       bitset(unsigned long __val)
@@ -162,7 +161,7 @@ namespace __debug
 
       bitset(const _Base& __x) : _Base(__x) { }
 
-#ifdef __GXX_EXPERIMENTAL_CXX0X__
+#if __cplusplus >= 201103L
       template<typename _CharT>
         explicit
         bitset(const _CharT* __str,
@@ -263,7 +262,7 @@ namespace __debug
       operator[](size_t __pos)
       {
        __glibcxx_check_subscript(__pos);
-#ifdef __GXX_EXPERIMENTAL_CXX0X__
+#if __cplusplus >= 201103L
        return _M_base()[__pos];
 #else
        return reference(_M_base()[__pos], this);
@@ -275,7 +274,7 @@ namespace __debug
       _GLIBCXX_CONSTEXPR bool
       operator[](size_t __pos) const
       {
-#ifndef __GXX_EXPERIMENTAL_CXX0X__
+#if __cplusplus < 201103L
        // TODO: Check in debug-mode too.
        __glibcxx_check_subscript(__pos);
 #endif
@@ -283,7 +282,7 @@ namespace __debug
       }
 
       using _Base::to_ulong;
-#ifdef __GXX_EXPERIMENTAL_CXX0X__
+#if __cplusplus >= 201103L
       using _Base::to_ullong;
 #endif
 
@@ -409,7 +408,7 @@ namespace __debug
 
 } // namespace __debug
 
-#ifdef __GXX_EXPERIMENTAL_CXX0X__
+#if __cplusplus >= 201103L
   // DR 1182.
   /// std::hash specialization for bitset.
   template<size_t _Nb>