Imported Upstream version 4.8.1

[platform/upstream/gcc48.git] / libstdc++-v3 / include / profile / unordered_map

diff --git a/libstdc++-v3/include/profile/unordered_map b/libstdc++-v3/include/profile/unordered_map
index 266e804..0fee176 100644 (file)
--- a/libstdc++-v3/include/profile/unordered_map
+++ b/libstdc++-v3/include/profile/unordered_map
@@ -1,6 +1,6 @@
 // Profiling unordered_map/unordered_multimap implementation -*- C++ -*-
 
-// Copyright (C) 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+// Copyright (C) 2009-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
@@ -28,7 +28,7 @@
 #ifndef _GLIBCXX_PROFILE_UNORDERED_MAP
 #define _GLIBCXX_PROFILE_UNORDERED_MAP 1
 
-#ifndef __GXX_EXPERIMENTAL_CXX0X__
+#if __cplusplus < 201103L
 # include <bits/c++0x_warning.h>
 #else
 # include <unordered_map>
@@ -330,7 +330,7 @@ namespace __profile
     inline bool
     operator==(const unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
               const unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
-    { return __x._M_equal(__y); }
+    { return static_cast<const _GLIBCXX_STD_BASE&>(__x) == __y; }
 
   template<typename _Key, typename _Tp, typename _Hash,
           typename _Pred, typename _Alloc>
@@ -599,7 +599,7 @@ namespace __profile
     inline bool
     operator==(const unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
               const unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
-    { return __x._M_equal(__y); }
+    { return static_cast<const _GLIBCXX_STD_BASE&>(__x) == __y; }
 
   template<typename _Key, typename _Tp, typename _Hash,
           typename _Pred, typename _Alloc>
@@ -614,6 +614,6 @@ namespace __profile
 #undef _GLIBCXX_BASE
 #undef _GLIBCXX_STD_BASE
 
-#endif // __GXX_EXPERIMENTAL_CXX0X__
+#endif // C++11
 
 #endif