Move from CPP to CXX.

[thirdparty/gcc.git] / libstdc++-v3 / include / bits / stl_pair.h

diff --git a/libstdc++-v3/include/bits/stl_pair.h b/libstdc++-v3/include/bits/stl_pair.h
index b0411b2becc9e2cc1a5eed119136c78856d259dc..0d0047fac48e39da858ab9e95765e6597454cd64 100644 (file)
--- a/libstdc++-v3/include/bits/stl_pair.h
+++ b/libstdc++-v3/include/bits/stl_pair.h
@@ -58,8 +58,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef __GLIBCPP_INTERNAL_PAIR_H
-#define __GLIBCPP_INTERNAL_PAIR_H
+#ifndef _PAIR_H
+#define _PAIR_H 1
 
 namespace std
 {
@@ -72,7 +72,7 @@ struct pair {
 
   _T1 first;                 ///< @c first is a copy of the first object
   _T2 second;                ///< @c second is a copy of the second object
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
+#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
 //265.  std::pair::pair() effects overly restrictive
   /** The default constructor creates @c first and @c second using their
    *  respective default constructors.  */
@@ -138,7 +138,7 @@ inline bool operator>=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) {
  *  the LWG by default.
 */
 template <class _T1, class _T2>
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
+#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
 //181.  make_pair() unintended behavior
 inline pair<_T1, _T2> make_pair(_T1 __x, _T2 __y)
 #else
@@ -150,7 +150,7 @@ inline pair<_T1, _T2> make_pair(const _T1& __x, const _T2& __y)
 
 } // namespace std
 
-#endif /* __GLIBCPP_INTERNAL_PAIR_H */
+#endif /* _PAIR_H */
 
 // Local Variables:
 // mode:C++