From 8564db8424b6988dd1b665e29f579c732a6001dc Mon Sep 17 00:00:00 2001
From: bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 22 Feb 2013 11:51:54 +0000
Subject: 2013-02-22  Basile Starynkevitch  <basile@starynkevitch.net>

	MELT branch merged with trunk rev 196218 using svnmerge.py



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@196219 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libstdc++-v3/include/bits/basic_ios.h |  2 +-
 libstdc++-v3/include/bits/regex.h     |  4 ++--
 libstdc++-v3/include/bits/stl_pair.h  |  9 ++++++++-
 libstdc++-v3/include/bits/stringfwd.h | 15 ++++++++++-----
 4 files changed, 21 insertions(+), 9 deletions(-)

(limited to 'libstdc++-v3/include/bits')

diff --git a/libstdc++-v3/include/bits/basic_ios.h b/libstdc++-v3/include/bits/basic_ios.h
index b78b464ba02..5325800df90 100644
--- a/libstdc++-v3/include/bits/basic_ios.h
+++ b/libstdc++-v3/include/bits/basic_ios.h
@@ -69,7 +69,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       //@{
       /**
        *  These are standard types.  They permit a standardized way of
-       *  referring to names of (or names dependant on) the template
+       *  referring to names of (or names dependent on) the template
        *  parameters, which are specific to the implementation.
       */
       typedef _CharT                                 char_type;
diff --git a/libstdc++-v3/include/bits/regex.h b/libstdc++-v3/include/bits/regex.h
index 39704bee716..101925a66f8 100644
--- a/libstdc++-v3/include/bits/regex.h
+++ b/libstdc++-v3/include/bits/regex.h
@@ -135,7 +135,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 	}
 
       /**
-       * @brief Gets a sort key for a character sequence, independant of case.
+       * @brief Gets a sort key for a character sequence, independent of case.
        *
        * @param __first beginning of the character sequence.
        * @param __last  one-past-the-end of the character sequence.
@@ -185,7 +185,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
        * the returned mask identifies the classification regardless of
        * the case of the characters to be matched (for example,
        * [[:lower:]] is the same as [[:alpha:]]), otherwise a
-       * case-dependant classification is returned.  The value
+       * case-dependent classification is returned.  The value
        * returned shall be independent of the case of the characters
        * in the character sequence. If the name is not recognized then
        * returns a value that compares equal to 0.
diff --git a/libstdc++-v3/include/bits/stl_pair.h b/libstdc++-v3/include/bits/stl_pair.h
index 967951cfecc..92250166b40 100644
--- a/libstdc++-v3/include/bits/stl_pair.h
+++ b/libstdc++-v3/include/bits/stl_pair.h
@@ -66,6 +66,11 @@ namespace std _GLIBCXX_VISIBILITY(default)
 {
 _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
+  /**
+   *  @addtogroup utilities
+   *  @{
+   */
+
 #if __cplusplus >= 201103L
   /// piecewise_construct_t
   struct piecewise_construct_t { };
@@ -282,7 +287,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     { return pair<_T1, _T2>(__x, __y); }
 #endif
 
+  /// @}
+
 _GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
+} // namespace std
 
 #endif /* _STL_PAIR_H */
diff --git a/libstdc++-v3/include/bits/stringfwd.h b/libstdc++-v3/include/bits/stringfwd.h
index e204b08940e..5d5b83f5e96 100644
--- a/libstdc++-v3/include/bits/stringfwd.h
+++ b/libstdc++-v3/include/bits/stringfwd.h
@@ -60,12 +60,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
   template<> struct char_traits<char>;
 
-  typedef basic_string<char>    string;   /// A string of @c char
+  /// A string of @c char
+  typedef basic_string<char>    string;   
 
 #ifdef _GLIBCXX_USE_WCHAR_T
   template<> struct char_traits<wchar_t>;
 
-  typedef basic_string<wchar_t> wstring;   /// A string of @c wchar_t
+  /// A string of @c wchar_t
+  typedef basic_string<wchar_t> wstring;   
 #endif
 
 #if ((__cplusplus >= 201103L) \
@@ -74,13 +76,16 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
   template<> struct char_traits<char16_t>;
   template<> struct char_traits<char32_t>;
 
-  typedef basic_string<char16_t> u16string; /// A string of @c char16_t
-  typedef basic_string<char32_t> u32string; /// A string of @c char32_t
+  /// A string of @c char16_t
+  typedef basic_string<char16_t> u16string; 
+
+  /// A string of @c char32_t
+  typedef basic_string<char32_t> u32string; 
 
 #endif
   /** @}  */
 
 _GLIBCXX_END_NAMESPACE_VERSION
-} // namespace
+} // namespace std
 
 #endif	// _STRINGFWD_H
-- 
cgit v1.2.1