Imported Upstream version 4.8.1

[platform/upstream/gcc48.git] / libstdc++-v3 / include / ext / algorithm

diff --git a/libstdc++-v3/include/ext/algorithm b/libstdc++-v3/include/ext/algorithm
index e9a48db..57c33b4 100644 (file)
--- a/libstdc++-v3/include/ext/algorithm
+++ b/libstdc++-v3/include/ext/algorithm
@@ -1,8 +1,6 @@
 // Algorithm extensions -*- C++ -*-
 
-// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-// 2009, 2010, 2011
-// Free Software Foundation, Inc.
+// Copyright (C) 2001-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
@@ -427,7 +425,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
                             __out_last - __out_first);
     }
 
-#ifdef __GXX_EXPERIMENTAL_CXX0X__
+#if __cplusplus >= 201103L
   using std::is_heap;
 #else
   /**
@@ -471,7 +469,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     }
 #endif
 
-#ifdef __GXX_EXPERIMENTAL_CXX0X__
+#if __cplusplus >= 201103L
   using std::is_sorted;
 #else
   // is_sorted, a predicated testing whether a range is sorted in
@@ -529,7 +527,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
          return false;
       return true;
     }
-#endif  // __GXX_EXPERIMENTAL_CXX0X__
+#endif  // C++11
 
   /**
    *  @brief Find the median of three values.