2012-03-08 Benjamin Kosnik <bkoz@redhat.com>

	    * doc/doxygen/user.cfg.in: Update to Doxygen 1.8.0.
	    * include/bits/locale_facets.h: Adjust markup to avoid warnings.
	    * include/ext/pb_ds/assoc_container.hpp: Same.
	    * include/ext/pb_ds/priority_queue.hpp: Same.
	    * include/std/fstream: Same.
	    * include/std/ratio: Same.
	    * testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Adjust line
	    numbers.
	    * testsuite/20_util/ratio/operations/ops_overflow_neg.cc: Same.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@185094 138bc75d-0d04-0410-961f-82ee72b054a4

9 files changed, 324 insertions, 288 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ce28ef14981..78f9e672f98 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,15 @@
+2012-03-08  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* doc/doxygen/user.cfg.in: Update to Doxygen 1.8.0.
+	* include/bits/locale_facets.h: Adjust markup to avoid warnings.
+	* include/ext/pb_ds/assoc_container.hpp: Same.
+	* include/ext/pb_ds/priority_queue.hpp: Same.
+	* include/std/fstream: Same.
+	* include/std/ratio: Same.
+	* testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Adjust line
+	numbers.
+	* testsuite/20_util/ratio/operations/ops_overflow_neg.cc: Same.
+
 2012-03-08  Jonathan Wakely  <jwakely.gcc@gmail.com>
 
 	PR libstdc++/52433
@@ -121,7 +133,7 @@
 	* config/abi/post/solaris2.10/sparcv9/baseline_symbols.txt: Likewise.
 
 2012-03-01  Benjamin Kosnik  <bkoz@redhat.com>
-            Ramana Radhakrishnan <ramana@gcc.gnu.org>
+	    Ramana Radhakrishnan <ramana@gcc.gnu.org>
 
 	PR libstdc++/51785
 	* acinclude.m4 (GLIBCXX_CHECK_STDIO_PROTO): New.
diff --git a/libstdc++-v3/doc/doxygen/user.cfg.in b/libstdc++-v3/doc/doxygen/user.cfg.in
index af667b51bae..3defd8d1d1d 100644
--- a/libstdc++-v3/doc/doxygen/user.cfg.in
+++ b/libstdc++-v3/doc/doxygen/user.cfg.in
@@ -1,4 +1,4 @@
-# Doxyfile 1.7.6.1
+# Doxyfile 1.8.0
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -194,8 +194,8 @@ TAB_SIZE               = 4
 # You can put \n's in the value part of an alias to insert newlines.
 
 ALIASES                = "doctodo=@todo\nNeeds documentation! See http://gcc.gnu.org/onlinedocs/libstdc++/manual/documentation_style.html" \
-			 "headername{1}=Instead, include <\1>." \
-			 "headername{2}=Instead, include <\1> or <\2>."
+                         "headername{1}=Instead, include <\1>." \
+                         "headername{2}=Instead, include <\1> or <\2>."
 
 # This tag can be used to specify a number of word-keyword mappings (TCL only).
 # A mapping has the form "name=value". For example adding
@@ -242,6 +242,15 @@ OPTIMIZE_OUTPUT_VHDL   = NO
 
 EXTENSION_MAPPING      =
 
+# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all
+# comments according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you
+# can mix doxygen, HTML, and XML commands with Markdown formatting.
+# Disable only in case of backward compatibilities issues.
+
+MARKDOWN_SUPPORT       = YES
+
 # If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
 # to include (a tag file for) the STL sources as input, then you should
 # set this tag to YES in order to let doxygen match functions declarations and
@@ -355,6 +364,10 @@ EXTRACT_ALL            = NO
 
 EXTRACT_PRIVATE        = NO
 
+# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal scope will be included in the documentation.
+
+EXTRACT_PACKAGE        = NO
+
 # If the EXTRACT_STATIC tag is set to YES all static members of a file
 # will be included in the documentation.
 
@@ -651,171 +664,171 @@ WARN_LOGFILE           =
 # with spaces.
 
 INPUT                  = @srcdir@/doc/doxygen/doxygroups.cc \
-			 @srcdir@/libsupc++/cxxabi.h \
-			 @srcdir@/libsupc++/exception \
-			 @srcdir@/libsupc++/initializer_list \
-			 @srcdir@/libsupc++/new \
-			 @srcdir@/libsupc++/typeinfo \
-			 include/algorithm \
-			 include/array \
-			 include/atomic \
-			 include/bitset \
-			 include/chrono \
-			 include/complex \
-			 include/condition_variable \
-			 include/deque \
-			 include/forward_list \
-			 include/fstream \
-			 include/functional \
-			 include/future \
-			 include/iomanip \
-			 include/ios \
-			 include/iosfwd \
-			 include/iostream \
-			 include/istream \
-			 include/iterator \
-			 include/limits \
-			 include/list \
-			 include/locale \
-			 include/map \
-			 include/memory \
-			 include/mutex \
-			 include/numeric \
-			 include/ostream \
-			 include/queue \
-			 include/random \
-			 include/ratio \
-			 include/regex \
-			 include/scoped_allocator \
-			 include/set \
-			 include/sstream \
-			 include/stack \
-			 include/stdexcept \
-			 include/streambuf \
-			 include/string \
-			 include/system_error \
-			 include/thread \
-			 include/tuple \
-			 include/typeindex \
-			 include/type_traits \
-			 include/unordered_map \
-			 include/unordered_set \
-			 include/utility \
-			 include/valarray \
-			 include/vector \
-			 include/cassert \
-			 include/ccomplex \
-			 include/cctype \
-			 include/cerrno \
-			 include/cfenv \
-			 include/cfloat \
-			 include/cinttypes \
-			 include/ciso646 \
-			 include/climits \
-			 include/clocale \
-			 include/cmath \
-			 include/csetjmp \
-			 include/csignal \
-			 include/cstdarg \
-			 include/cstdbool \
-			 include/cstddef \
-			 include/cstdint \
-			 include/cstdio \
-			 include/cstdlib \
-			 include/cstring \
-			 include/ctgmath \
-			 include/ctime \
-			 include/cwchar \
-			 include/cwctype \
-			 include/ \
-			 include/bits \
-			 include/@host_alias@/bits \
-			 include/backward \
-			 include/backward/hash_map \
-			 include/backward/hash_set \
-			 include/backward/strstream \
-			 include/debug \
-			 include/debug/bitset \
-			 include/debug/deque \
-			 include/debug/forward_list \
-			 include/debug/list \
-			 include/debug/map \
-			 include/debug/set \
-			 include/debug/string \
-			 include/debug/unordered_map \
-			 include/debug/unordered_set \
-			 include/debug/vector \
-			 include/profile \
-			 include/profile/impl \
-			 include/profile/bitset \
-			 include/profile/deque \
-			 include/profile/forward_list \
-			 include/profile/list \
-			 include/profile/map \
-			 include/profile/set \
-			 include/profile/unordered_map \
-			 include/profile/unordered_set \
-			 include/profile/vector \
-			 include/ext/algorithm \
-			 include/ext/functional \
-			 include/ext/iterator \
-			 include/ext/memory \
-			 include/ext/numeric \
-			 include/ext/rb_tree \
-			 include/ext/rope \
-			 include/ext/slist \
-			 include/parallel \
-			 include/parallel/algorithm \
-			 include/parallel/numeric \
-			 include/tr1/ccomplex \
-			 include/tr1/cctype \
-			 include/tr1/cfenv \
-			 include/tr1/cfloat \
-			 include/tr1/cinttypes \
-			 include/tr1/climits \
-			 include/tr1/cmath \
-			 include/tr1/complex \
-			 include/tr1/cstdarg \
-			 include/tr1/cstdbool \
-			 include/tr1/cstdint \
-			 include/tr1/cstdio \
-			 include/tr1/cstdlib \
-			 include/tr1/ctgmath \
-			 include/tr1/ctime \
-			 include/tr1/cwchar \
-			 include/tr1/cwctype \
-			 include/tr2/ \
-			 include/tr2/bool_set \
-			 include/tr2/dynamic_bitset \
-			 include/tr2/ratio \
-			 include/tr2/type_traits \
-			 include/decimal/decimal \
-			 include/ext \
-			 include/ext/pb_ds \
-			 include/ext/pb_ds/detail \
-			 include/ext/pb_ds/detail/binary_heap_ \
-			 include/ext/pb_ds/detail/binomial_heap_ \
-			 include/ext/pb_ds/detail/binomial_heap_base_ \
-			 include/ext/pb_ds/detail/bin_search_tree_ \
-			 include/ext/pb_ds/detail/branch_policy \
-			 include/ext/pb_ds/detail/cc_hash_table_map_ \
-			 include/ext/pb_ds/detail/eq_fn \
-			 include/ext/pb_ds/detail/gp_hash_table_map_ \
-			 include/ext/pb_ds/detail/hash_fn \
-			 include/ext/pb_ds/detail/left_child_next_sibling_heap_ \
-			 include/ext/pb_ds/detail/list_update_map_ \
-			 include/ext/pb_ds/detail/list_update_policy \
-			 include/ext/pb_ds/detail/ov_tree_map_ \
-			 include/ext/pb_ds/detail/pairing_heap_ \
-			 include/ext/pb_ds/detail/pat_trie_ \
-			 include/ext/pb_ds/detail/rb_tree_map_ \
-			 include/ext/pb_ds/detail/rc_binomial_heap_ \
-			 include/ext/pb_ds/detail/resize_policy \
-			 include/ext/pb_ds/detail/splay_tree_ \
-			 include/ext/pb_ds/detail/thin_heap_ \
-			 include/ext/pb_ds/detail/tree_policy \
-			 include/ext/pb_ds/detail/trie_policy \
-			 include/ext/pb_ds/detail/unordered_iterator
+                         @srcdir@/libsupc++/cxxabi.h \
+                         @srcdir@/libsupc++/exception \
+                         @srcdir@/libsupc++/initializer_list \
+                         @srcdir@/libsupc++/new \
+                         @srcdir@/libsupc++/typeinfo \
+                         include/algorithm \
+                         include/array \
+                         include/atomic \
+                         include/bitset \
+                         include/chrono \
+                         include/complex \
+                         include/condition_variable \
+                         include/deque \
+                         include/forward_list \
+                         include/fstream \
+                         include/functional \
+                         include/future \
+                         include/iomanip \
+                         include/ios \
+                         include/iosfwd \
+                         include/iostream \
+                         include/istream \
+                         include/iterator \
+                         include/limits \
+                         include/list \
+                         include/locale \
+                         include/map \
+                         include/memory \
+                         include/mutex \
+                         include/numeric \
+                         include/ostream \
+                         include/queue \
+                         include/random \
+                         include/ratio \
+                         include/regex \
+                         include/scoped_allocator \
+                         include/set \
+                         include/sstream \
+                         include/stack \
+                         include/stdexcept \
+                         include/streambuf \
+                         include/string \
+                         include/system_error \
+                         include/thread \
+                         include/tuple \
+                         include/typeindex \
+                         include/type_traits \
+                         include/unordered_map \
+                         include/unordered_set \
+                         include/utility \
+                         include/valarray \
+                         include/vector \
+                         include/cassert \
+                         include/ccomplex \
+                         include/cctype \
+                         include/cerrno \
+                         include/cfenv \
+                         include/cfloat \
+                         include/cinttypes \
+                         include/ciso646 \
+                         include/climits \
+                         include/clocale \
+                         include/cmath \
+                         include/csetjmp \
+                         include/csignal \
+                         include/cstdarg \
+                         include/cstdbool \
+                         include/cstddef \
+                         include/cstdint \
+                         include/cstdio \
+                         include/cstdlib \
+                         include/cstring \
+                         include/ctgmath \
+                         include/ctime \
+                         include/cwchar \
+                         include/cwctype \
+                         include/ \
+                         include/bits \
+                         include/@host_alias@/bits \
+                         include/backward \
+                         include/backward/hash_map \
+                         include/backward/hash_set \
+                         include/backward/strstream \
+                         include/debug \
+                         include/debug/bitset \
+                         include/debug/deque \
+                         include/debug/forward_list \
+                         include/debug/list \
+                         include/debug/map \
+                         include/debug/set \
+                         include/debug/string \
+                         include/debug/unordered_map \
+                         include/debug/unordered_set \
+                         include/debug/vector \
+                         include/profile \
+                         include/profile/impl \
+                         include/profile/bitset \
+                         include/profile/deque \
+                         include/profile/forward_list \
+                         include/profile/list \
+                         include/profile/map \
+                         include/profile/set \
+                         include/profile/unordered_map \
+                         include/profile/unordered_set \
+                         include/profile/vector \
+                         include/ext/algorithm \
+                         include/ext/functional \
+                         include/ext/iterator \
+                         include/ext/memory \
+                         include/ext/numeric \
+                         include/ext/rb_tree \
+                         include/ext/rope \
+                         include/ext/slist \
+                         include/parallel \
+                         include/parallel/algorithm \
+                         include/parallel/numeric \
+                         include/tr1/ccomplex \
+                         include/tr1/cctype \
+                         include/tr1/cfenv \
+                         include/tr1/cfloat \
+                         include/tr1/cinttypes \
+                         include/tr1/climits \
+                         include/tr1/cmath \
+                         include/tr1/complex \
+                         include/tr1/cstdarg \
+                         include/tr1/cstdbool \
+                         include/tr1/cstdint \
+                         include/tr1/cstdio \
+                         include/tr1/cstdlib \
+                         include/tr1/ctgmath \
+                         include/tr1/ctime \
+                         include/tr1/cwchar \
+                         include/tr1/cwctype \
+                         include/tr2/ \
+                         include/tr2/bool_set \
+                         include/tr2/dynamic_bitset \
+                         include/tr2/ratio \
+                         include/tr2/type_traits \
+                         include/decimal/decimal \
+                         include/ext \
+                         include/ext/pb_ds \
+                         include/ext/pb_ds/detail \
+                         include/ext/pb_ds/detail/binary_heap_ \
+                         include/ext/pb_ds/detail/binomial_heap_ \
+                         include/ext/pb_ds/detail/binomial_heap_base_ \
+                         include/ext/pb_ds/detail/bin_search_tree_ \
+                         include/ext/pb_ds/detail/branch_policy \
+                         include/ext/pb_ds/detail/cc_hash_table_map_ \
+                         include/ext/pb_ds/detail/eq_fn \
+                         include/ext/pb_ds/detail/gp_hash_table_map_ \
+                         include/ext/pb_ds/detail/hash_fn \
+                         include/ext/pb_ds/detail/left_child_next_sibling_heap_ \
+                         include/ext/pb_ds/detail/list_update_map_ \
+                         include/ext/pb_ds/detail/list_update_policy \
+                         include/ext/pb_ds/detail/ov_tree_map_ \
+                         include/ext/pb_ds/detail/pairing_heap_ \
+                         include/ext/pb_ds/detail/pat_trie_ \
+                         include/ext/pb_ds/detail/rb_tree_map_ \
+                         include/ext/pb_ds/detail/rc_binomial_heap_ \
+                         include/ext/pb_ds/detail/resize_policy \
+                         include/ext/pb_ds/detail/splay_tree_ \
+                         include/ext/pb_ds/detail/thin_heap_ \
+                         include/ext/pb_ds/detail/tree_policy \
+                         include/ext/pb_ds/detail/trie_policy \
+                         include/ext/pb_ds/detail/unordered_iterator
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
@@ -834,8 +847,8 @@ INPUT_ENCODING         = UTF-8
 # *.f90 *.f *.for *.vhd *.vhdl
 
 FILE_PATTERNS          = *.h \
-			 *.hpp \
-			 *.tcc
+                         *.hpp \
+                         *.tcc
 
 # The RECURSIVE tag can be used to turn specify whether or not subdirectories
 # should be searched for input files as well. Possible values are YES and NO.
@@ -864,9 +877,9 @@ EXCLUDE_SYMLINKS       = NO
 # for example use the pattern */test/*
 
 EXCLUDE_PATTERNS       = stamp-* \
-			 doxygroups.cc \
-			 *.gch \
-			 */.svn/*
+                         doxygroups.cc \
+                         *.gch \
+                         */.svn/*
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
 # (namespaces, classes, functions, etc.) that should be excluded from the
@@ -1334,7 +1347,7 @@ FORMULA_TRANSPARENT    = YES
 # (see http://www.mathjax.org) which uses client side Javascript for the
 # rendering instead of using prerendered bitmaps. Use this if you do not
 # have LaTeX installed or if you want to formulas look prettier in the HTML
-# output. When enabled you also need to install MathJax separately and
+# output. When enabled you may also need to install MathJax separately and
 # configure the path to it using the MATHJAX_RELPATH option.
 
 USE_MATHJAX            = NO
@@ -1343,10 +1356,11 @@ USE_MATHJAX            = NO
 # HTML output directory using the MATHJAX_RELPATH option. The destination
 # directory should contain the MathJax.js script. For instance, if the mathjax
 # directory is located at the same level as the HTML output directory, then
-# MATHJAX_RELPATH should be ../mathjax. The default value points to the
-# mathjax.org site, so you can quickly see the result without installing
-# MathJax, but it is strongly recommended to install a local copy of MathJax
-# before deployment.
+# MATHJAX_RELPATH should be ../mathjax. The default value points to
+# the MathJax Content Delivery Network so you can quickly see the result without
+# installing MathJax.
+# However, it is strongly recommended to install a local
+# copy of MathJax from http://www.mathjax.org before deployment.
 
 MATHJAX_RELPATH        = http://www.mathjax.org/mathjax
 
@@ -1676,43 +1690,48 @@ INCLUDE_FILE_PATTERNS  =
 # instead of the = operator.
 
 PREDEFINED             = __cplusplus \
-			 __GTHREADS \
-			 _GLIBCXX_HAS_GTHREADS \
-			 __GXX_EXPERIMENTAL_CXX0X__ \
-			 _GLIBCXX_INCLUDE_AS_CXX0X \
-			 "_GLIBCXX_PURE= " \
-			 "_GLIBCXX_CONST= " \
-			 "_GLIBCXX_NORETURN= " \
-			 "_GLIBCXX_NOTHROW= " \
-			 "_GLIBCXX_STD_C= " \
-			 "_GLIBCXX_STD_A= " \
-			 "_GLIBCXX_VISIBILITY(V)= " \
-			 "_GLIBCXX_BEGIN_NAMESPACE_VERSION= " \
+                         __GTHREADS \
+                         _GLIBCXX_HAS_GTHREADS \
+                         __GXX_EXPERIMENTAL_CXX0X__ \
+                         _GLIBCXX_INCLUDE_AS_CXX0X \
+                         "_GLIBCXX_PURE= " \
+                         "_GLIBCXX_CONST= " \
+                         "_GLIBCXX_NORETURN= " \
+                         "_GLIBCXX_STD_C= " \
+                         "_GLIBCXX_STD_A= " \
+                         "_GLIBCXX_VISIBILITY(V)= " \
+                         "_GLIBCXX_BEGIN_NAMESPACE_VERSION= " \
+                         "_GLIBCXX_BEGIN_NAMESPACE_ALGO= " \
+                         "_GLIBCXX_BEGIN_NAMESPACE_CONTAINER= " \
+                         "_GLIBCXX_BEGIN_NAMESPACE_LDBL= " \
+                         "_GLIBCXX_END_NAMESPACE_VERSION= " \
+                         "_GLIBCXX_END_NAMESPACE_ALGO= " \
+                         "_GLIBCXX_END_NAMESPACE_CONTAINER= " \
+                         "_GLIBCXX_END_NAMESPACE_LDBL= " \
+                         "_GLIBCXX_TEMPLATE_ARGS=...  " \
+                         _GLIBCXX_DEPRECATED \
+                         _GLIBCXX_CONSTEXPR=constexpr \
+                         _GLIBCXX_USE_CONSTEXPR=constexpr \
+			 "_GLIBCXX_THROW(E)= " \
+                         _GLIBCXX_NOEXCEPT=noexcept \
+                         _GLIBCXX_NOTHROW=noexcept \
+                         _GLIBCXX_USE_NOEXCEPT=noexcept \
+                         _GLIBCXX_USE_WCHAR_T \
+                         _GLIBCXX_USE_LONG_LONG \
+                         _GLIBCXX_USE_C99_STDINT_TR1 \
+                         _GLIBCXX_USE_SCHED_YIELD \
+                         _GLIBCXX_USE_NANOSLEEP \
+                         __EXCEPTIONS \
+                         __GXX_RTTI \
+                         ATOMIC_INT_LOCK_FREE \
+                         PB_DS_DATA_TRUE_INDICATOR \
+                         PB_DS_STATIC_ASSERT=// \
 			 "_GLIBCXX_BEGIN_NAMESPACE_ALGO= " \
-			 "_GLIBCXX_BEGIN_NAMESPACE_CONTAINER= " \
-			 "_GLIBCXX_BEGIN_NAMESPACE_LDBL= " \
-			 "_GLIBCXX_END_NAMESPACE_VERSION= " \
-			 "_GLIBCXX_END_NAMESPACE_ALGO= " \
-			 "_GLIBCXX_END_NAMESPACE_CONTAINER= " \
-			 "_GLIBCXX_END_NAMESPACE_LDBL= " \
-			 "_GLIBCXX_TEMPLATE_ARGS=...  " \
-			 _GLIBCXX_DEPRECATED \
-			 _GLIBCXX_CONSTEXPR=constexpr \
-			 _GLIBCXX_USE_CONSTEXPR=constexpr \
-			 _GLIBCXX_USE_WCHAR_T \
-			 _GLIBCXX_USE_LONG_LONG \
-			 _GLIBCXX_USE_C99_STDINT_TR1 \
-			 _GLIBCXX_USE_SCHED_YIELD \
-			 _GLIBCXX_USE_NANOSLEEP \
-			 __EXCEPTIONS \
-			 __GXX_RTTI \
-			 ATOMIC_INT_LOCK_FREE \
-			 PB_DS_DATA_TRUE_INDICATOR \
-			 __glibcxx_function_requires=// \
-			 __glibcxx_class_requires=// \
-			 __glibcxx_class_requires2=// \
-			 __glibcxx_class_requires3=// \
-			 __glibcxx_class_requires4=//
+                         __glibcxx_function_requires=// \
+                         __glibcxx_class_requires=// \
+                         __glibcxx_class_requires2=// \
+                         __glibcxx_class_requires3=// \
+                         __glibcxx_class_requires4=//
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
 # this tag can be used to specify a list of macro names that should be expanded.
@@ -1733,22 +1752,18 @@ SKIP_FUNCTION_MACROS   = YES
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-# The TAGFILES option can be used to specify one or more tagfiles.
-# Optionally an initial location of the external documentation
-# can be added for each tagfile. The format of a tag file without
-# this location is as follows:
+# The TAGFILES option can be used to specify one or more tagfiles. For each
+# tag file the location of the external documentation should be added. The
+# format of a tag file without this location is as follows:
 #
 # TAGFILES = file1 file2 ...
 # Adding location for the tag files is done as follows:
 #
 # TAGFILES = file1=loc1 "file2 = loc2" ...
-# where "loc1" and "loc2" can be relative or absolute paths or
-# URLs. If a location is present for each tag, the installdox tool
-# does not have to be run to correct the links.
-# Note that each tag file must have a unique name
-# (where the name does NOT include the path)
-# If a tag file is not located in the directory in which doxygen
-# is run, you must also specify the path to the tagfile here.
+# where "loc1" and "loc2" can be relative or absolute paths
+# or URLs. Note that each tag file must have a unique name (where the name does
+# NOT include the path). If a tag file is not located in the directory in which
+# doxygen is run, you must also specify the path to the tagfile here.
 
 TAGFILES               =
 
@@ -1861,6 +1876,15 @@ GROUP_GRAPHS           = YES
 
 UML_LOOK               = NO
 
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside
+# the class node. If there are many fields or methods and many nodes the
+# graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS
+# threshold limits the number of items for each type to make the size more
+# managable. Set this to 0 for no limit. Note that the threshold may be
+# exceeded by 50% before the limit is enforced.
+
+UML_LIMIT_NUM_FIELDS   = 10
+
 # If set to YES, the inheritance and collaboration graphs will show the
 # relations between templates and their instances.
 
diff --git a/libstdc++-v3/include/bits/locale_facets.h b/libstdc++-v3/include/bits/locale_facets.h
index dc95f5a7551..baf54d79846 100644
--- a/libstdc++-v3/include/bits/locale_facets.h
+++ b/libstdc++-v3/include/bits/locale_facets.h
@@ -1,7 +1,7 @@
 // Locale support -*- C++ -*-
 
 // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-// 2006, 2007, 2008, 2009, 2010, 2011
+// 2006, 2007, 2008, 2009, 2010, 2011, 2012
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -40,7 +40,7 @@
 
 #include <cwctype>	// For wctype_t
 #include <cctype>
-#include <bits/ctype_base.h>	
+#include <bits/ctype_base.h>
 #include <iosfwd>
 #include <bits/ios_base.h>  // For ios_base, ios_base::iostate
 #include <streambuf>
@@ -1524,16 +1524,16 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     // Below are the indices into _S_atoms_out.
     enum
       {
-        _S_ominus,
-        _S_oplus,
-        _S_ox,
-        _S_oX,
-        _S_odigits,
-        _S_odigits_end = _S_odigits + 16,
-        _S_oudigits = _S_odigits_end,
-        _S_oudigits_end = _S_oudigits + 16,
-        _S_oe = _S_odigits + 14,  // For scientific notation, 'e'
-        _S_oE = _S_oudigits + 14, // For scientific notation, 'E'
+	_S_ominus,
+	_S_oplus,
+	_S_ox,
+	_S_oX,
+	_S_odigits,
+	_S_odigits_end = _S_odigits + 16,
+	_S_oudigits = _S_odigits_end,
+	_S_oudigits_end = _S_oudigits + 16,
+	_S_oe = _S_odigits + 14,  // For scientific notation, 'e'
+	_S_oE = _S_oudigits + 14, // For scientific notation, 'E'
 	_S_oend = _S_oudigits_end
       };
 
@@ -1599,7 +1599,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 	_M_truename(0), _M_truename_size(0), _M_falsename(0),
 	_M_falsename_size(0), _M_decimal_point(_CharT()),
 	_M_thousands_sep(_CharT()), _M_allocated(false)
-        { }
+	{ }
 
       ~__numpunct_cache();
 
@@ -1609,7 +1609,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     private:
       __numpunct_cache&
       operator=(const __numpunct_cache&);
-      
+
       explicit
       __numpunct_cache(const __numpunct_cache&);
     };
@@ -1981,9 +1981,10 @@ _GLIBCXX_BEGIN_NAMESPACE_LDBL
        *  specifier.  Otherwise, parses like %d for signed and %u for unsigned
        *  types.  The matching type length modifier is also used.
        *
-       *  Digit grouping is interpreted according to numpunct::grouping() and
-       *  numpunct::thousands_sep().  If the pattern of digit groups isn't
-       *  consistent, sets err to ios_base::failbit.
+       *  Digit grouping is interpreted according to
+       *  numpunct::grouping() and numpunct::thousands_sep().  If the
+       *  pattern of digit groups isn't consistent, sets err to
+       *  ios_base::failbit.
        *
        *  If parsing the string yields a valid value for @a v, @a v is set.
        *  Otherwise, sets err to ios_base::failbit and leaves @a v unaltered.
@@ -2040,9 +2041,10 @@ _GLIBCXX_BEGIN_NAMESPACE_LDBL
        *  matching type length modifier is also used.
        *
        *  The decimal point character used is numpunct::decimal_point().
-       *  Digit grouping is interpreted according to numpunct::grouping() and
-       *  numpunct::thousands_sep().  If the pattern of digit groups isn't
-       *  consistent, sets err to ios_base::failbit.
+       *  Digit grouping is interpreted according to
+       *  numpunct::grouping() and numpunct::thousands_sep().  If the
+       *  pattern of digit groups isn't consistent, sets err to
+       *  ios_base::failbit.
        *
        *  If parsing the string yields a valid value for @a v, @a v is set.
        *  Otherwise, sets err to ios_base::failbit and leaves @a v unaltered.
@@ -2079,9 +2081,10 @@ _GLIBCXX_BEGIN_NAMESPACE_LDBL
        *
        *  The input characters are parsed like the scanf %p specifier.
        *
-       *  Digit grouping is interpreted according to numpunct::grouping() and
-       *  numpunct::thousands_sep().  If the pattern of digit groups isn't
-       *  consistent, sets err to ios_base::failbit.
+       *  Digit grouping is interpreted according to
+       *  numpunct::grouping() and numpunct::thousands_sep().  If the
+       *  pattern of digit groups isn't consistent, sets err to
+       *  ios_base::failbit.
        *
        *  Note that the digit grouping effect for pointers is a bit ambiguous
        *  in the standard and shouldn't be relied on.  See DR 344.
@@ -2111,14 +2114,14 @@ _GLIBCXX_BEGIN_NAMESPACE_LDBL
 		       string&) const;
 
       template<typename _ValueT>
-        iter_type
-        _M_extract_int(iter_type, iter_type, ios_base&, ios_base::iostate&,
+	iter_type
+	_M_extract_int(iter_type, iter_type, ios_base&, ios_base::iostate&,
 		       _ValueT&) const;
 
       template<typename _CharT2>
       typename __gnu_cxx::__enable_if<__is_char<_CharT2>::__value, int>::__type
-        _M_find(const _CharT2*, size_t __len, _CharT2 __c) const
-        {
+	_M_find(const _CharT2*, size_t __len, _CharT2 __c) const
+	{
 	  int __ret = -1;
 	  if (__len <= 10)
 	    {
@@ -2138,10 +2141,10 @@ _GLIBCXX_BEGIN_NAMESPACE_LDBL
 	}
 
       template<typename _CharT2>
-      typename __gnu_cxx::__enable_if<!__is_char<_CharT2>::__value, 
+      typename __gnu_cxx::__enable_if<!__is_char<_CharT2>::__value,
 				      int>::__type
-        _M_find(const _CharT2* __zero, size_t __len, _CharT2 __c) const
-        {
+	_M_find(const _CharT2* __zero, size_t __len, _CharT2 __c) const
+	{
 	  int __ret = -1;
 	  const char_type* __q = char_traits<_CharT2>::find(__zero, __len, __c);
 	  if (__q)
@@ -2195,7 +2198,7 @@ _GLIBCXX_BEGIN_NAMESPACE_LDBL
       virtual iter_type
       do_get(iter_type __beg, iter_type __end, ios_base& __io,
 	     ios_base::iostate& __err, long long& __v) const
-      { return _M_extract_int(__beg, __end, __io, __err, __v); }	
+      { return _M_extract_int(__beg, __end, __io, __err, __v); }
 
       virtual iter_type
       do_get(iter_type __beg, iter_type __end, ios_base& __io,
@@ -2313,9 +2316,9 @@ _GLIBCXX_BEGIN_NAMESPACE_LDBL
        *  If ios_base::showbase is set, '0' precedes octal values (except 0)
        *  and '0[xX]' precedes hex values.
        *
-       *  Thousands separators are inserted according to numpunct::grouping()
-       *  and numpunct::thousands_sep().  The decimal point character used is
-       *  numpunct::decimal_point().
+       *  The decimal point character used is numpunct::decimal_point().
+       *  Thousands separators are inserted according to
+       *  numpunct::grouping() and numpunct::thousands_sep().
        *
        *  If io.width() is non-zero, enough @a fill characters are inserted to
        *  make the result at least that wide.  If
@@ -2376,9 +2379,9 @@ _GLIBCXX_BEGIN_NAMESPACE_LDBL
        *  If ios_base::showpoint is set, a decimal point will always be
        *  output.
        *
-       *  Thousands separators are inserted according to numpunct::grouping()
-       *  and numpunct::thousands_sep().  The decimal point character used is
-       *  numpunct::decimal_point().
+       *  The decimal point character used is numpunct::decimal_point().
+       *  Thousands separators are inserted according to
+       *  numpunct::grouping() and numpunct::thousands_sep().
        *
        *  If io.width() is non-zero, enough @a fill characters are inserted to
        *  make the result at least that wide.  If
@@ -2425,8 +2428,8 @@ _GLIBCXX_BEGIN_NAMESPACE_LDBL
 
     protected:
       template<typename _ValueT>
-        iter_type
-        _M_insert_float(iter_type, ios_base& __io, char_type __fill,
+	iter_type
+	_M_insert_float(iter_type, ios_base& __io, char_type __fill,
 			char __mod, _ValueT __v) const;
 
       void
@@ -2435,8 +2438,8 @@ _GLIBCXX_BEGIN_NAMESPACE_LDBL
 		     char_type* __cs, int& __len) const;
 
       template<typename _ValueT>
-        iter_type
-        _M_insert_int(iter_type, ios_base& __io, char_type __fill,
+	iter_type
+	_M_insert_int(iter_type, ios_base& __io, char_type __fill,
 		      _ValueT __v) const;
 
       void
@@ -2471,7 +2474,7 @@ _GLIBCXX_BEGIN_NAMESPACE_LDBL
 
       virtual iter_type
       do_put(iter_type __s, ios_base& __io, char_type __fill, long __v) const
-      { return _M_insert_int(__s, __io, __fill, __v); }	
+      { return _M_insert_int(__s, __io, __fill, __v); }
 
       virtual iter_type
       do_put(iter_type __s, ios_base& __io, char_type __fill,
@@ -2549,7 +2552,7 @@ _GLIBCXX_END_NAMESPACE_LDBL
 
   /// Convenience interface to ctype.is(ctype_base::lower, __c).
   template<typename _CharT>
-    inline bool 
+    inline bool
     islower(_CharT __c, const locale& __loc)
     { return use_facet<ctype<_CharT> >(__loc).is(ctype_base::lower, __c); }
 
diff --git a/libstdc++-v3/include/ext/pb_ds/assoc_container.hpp b/libstdc++-v3/include/ext/pb_ds/assoc_container.hpp
index 8196fc9e1c1..a6527698072 100644
--- a/libstdc++-v3/include/ext/pb_ds/assoc_container.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/assoc_container.hpp
@@ -57,7 +57,7 @@ namespace __gnu_pbds
    */
 
   /**
-   *  @defgroup hash-based
+   *  @defgroup hash-based Hash-Based
    *  @ingroup containers-pbds
    *  @{
    */
@@ -521,7 +521,7 @@ namespace __gnu_pbds
 
 
   /**
-   *  @defgroup branch-based
+   *  @defgroup branch-based Branch-Based
    *  @ingroup containers-pbds
    *  @{
    */
@@ -617,7 +617,7 @@ namespace __gnu_pbds
    *  @tparam Cmp_Fn	 	Comparison functor.
    *  @tparam Tag 	 	Instantiating data structure type,
    *                            see container_tag.
-   *  @tparam Node_Update 	Updates nodes,
+   *  @tparam Node_Update 	Updates tree internal-nodes,
    *                            restores invariants when invalidated.
    *                     XXX See design::tree-based-containers::node invariants.
    *  @tparam _Alloc 	 	Allocator type.
@@ -708,7 +708,7 @@ namespace __gnu_pbds
    *  @tparam _ATraits	  	Element access traits.
    *  @tparam Tag 	  	Instantiating data structure type,
    *                            see container_tag.
-   *  @tparam Node_Update 	Updates trie nodes,
+   *  @tparam Node_Update 	Updates trie internal-nodes,
    *                            restores invariants when invalidated.
    *                     XXX See design::tree-based-containers::node invariants.
    *  @tparam _Alloc 	  	Allocator type.
@@ -786,7 +786,7 @@ namespace __gnu_pbds
 
 
   /**
-   *  @defgroup list-based
+   *  @defgroup list-based List-Based
    *  @ingroup containers-pbds
    *  @{
    */
diff --git a/libstdc++-v3/include/ext/pb_ds/priority_queue.hpp b/libstdc++-v3/include/ext/pb_ds/priority_queue.hpp
index 825699f4685..0cbf45c45d0 100644
--- a/libstdc++-v3/include/ext/pb_ds/priority_queue.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/priority_queue.hpp
@@ -49,7 +49,7 @@
 namespace __gnu_pbds
 {
   /**
-   *  @defgroup heap-based
+   *  @defgroup heap-based Heap-Based
    *  @ingroup containers-pbds
    *  @{
    */
diff --git a/libstdc++-v3/include/std/fstream b/libstdc++-v3/include/std/fstream
index 65de272811f..b4a86a1a19f 100644
--- a/libstdc++-v3/include/std/fstream
+++ b/libstdc++-v3/include/std/fstream
@@ -232,7 +232,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
        *
        *  If a file is already open, this function immediately fails.
        *  Otherwise it tries to open the file named @a __s using the flags
-       *  given in @a mode.
+       *  given in @a __mode.
        *
        *  Table 92, adapted here, gives the relation between openmode
        *  combinations and the equivalent fopen() flags.
@@ -619,8 +619,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
        *  @param  __s  Null terminated string specifying the filename.
        *  @param  __mode  Open file in specified mode (see std::ios_base).
        *
-       *  @c ios_base::out|ios_base::trunc is automatically included in
-       *  @p __mode.
+       *  @c ios_base::out | @c ios_base::trunc is automatically included in
+       *  @a __mode.
        *
        *  Tip:  When using std::string to hold the filename, you must use
        *  .c_str() before passing it to this constructor.
@@ -640,7 +640,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
        *  @param  __s  std::string specifying the filename.
        *  @param  __mode  Open file in specified mode (see std::ios_base).
        *
-       *  @c ios_base::out|ios_base::trunc is automatically included in
+       *  @c ios_base::out | @c ios_base::trunc is automatically included in
        *  @a __mode.
        */
       explicit
diff --git a/libstdc++-v3/include/std/ratio b/libstdc++-v3/include/std/ratio
index a9cbfe246e3..1fd1f1600ef 100644
--- a/libstdc++-v3/include/std/ratio
+++ b/libstdc++-v3/include/std/ratio
@@ -63,9 +63,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     { };
 
   template<intmax_t _Pn, intmax_t _Qn>
-    struct __static_gcd;
- 
-  template<intmax_t _Pn, intmax_t _Qn>
     struct __static_gcd
     : __static_gcd<_Qn, (_Pn % _Qn)>
     { };
diff --git a/libstdc++-v3/testsuite/20_util/ratio/cons/cons_overflow_neg.cc b/libstdc++-v3/testsuite/20_util/ratio/cons/cons_overflow_neg.cc
index 8aa72f2e3f1..d2694e29c4c 100644
--- a/libstdc++-v3/testsuite/20_util/ratio/cons/cons_overflow_neg.cc
+++ b/libstdc++-v3/testsuite/20_util/ratio/cons/cons_overflow_neg.cc
@@ -49,7 +49,7 @@ test04()
 // { dg-error "required from here" "" { target *-*-* } 34 }
 // { dg-error "required from here" "" { target *-*-* } 40 }
 // { dg-error "required from here" "" { target *-*-* } 46 }
-// { dg-error "denominator cannot be zero" "" { target *-*-* } 268 }
-// { dg-error "out of range" "" { target *-*-* } 269 }
+// { dg-error "denominator cannot be zero" "" { target *-*-* } 265 }
+// { dg-error "out of range" "" { target *-*-* } 266 }
 // { dg-error "overflow in constant expression" "" { target *-*-* } 61 }
 // { dg-prune-output "not a member" }
diff --git a/libstdc++-v3/testsuite/20_util/ratio/operations/ops_overflow_neg.cc b/libstdc++-v3/testsuite/20_util/ratio/operations/ops_overflow_neg.cc
index 7483016b616..51a6bf65d2c 100644
--- a/libstdc++-v3/testsuite/20_util/ratio/operations/ops_overflow_neg.cc
+++ b/libstdc++-v3/testsuite/20_util/ratio/operations/ops_overflow_neg.cc
@@ -42,9 +42,9 @@ test02()
 // { dg-error "required from here" "" { target *-*-* } 29 }
 // { dg-error "required from here" "" { target *-*-* } 36 }
 // { dg-error "required from here" "" { target *-*-* } 38 }
-// { dg-error "overflow in addition" "" { target *-*-* } 432 }
-// { dg-error "overflow in multiplication" "" { target *-*-* } 104 }
-// { dg-error "overflow in multiplication" "" { target *-*-* } 100 }
-// { dg-error "overflow in multiplication" "" { target *-*-* } 102 }
+// { dg-error "overflow in addition" "" { target *-*-* } 429 }
+// { dg-error "overflow in multiplication" "" { target *-*-* } 97 }
+// { dg-error "overflow in multiplication" "" { target *-*-* } 99 }
+// { dg-error "overflow in multiplication" "" { target *-*-* } 101 }
 // { dg-prune-output "out of range" }
 // { dg-prune-output "not usable in a constant expression" }