OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

user.cfg.in: Update to Doxygen 1.8.0. 

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.

Co-Authored-By: Ramana Radhakrishnan <ramana@gcc.gnu.org>

From-SVN: r185094
This commit is contained in:
Benjamin Kosnik 2012-03-08 05:20:52 +00:00 committed by Benjamin Kosnik
parent 2a4368af97
commit d8dd52a990
9 changed files with 324 additions and 288 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libstdc++-v3/ChangeLog
View File

@ -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> 2012-03-08 Jonathan Wakely <jwakely.gcc@gmail.com>
PR libstdc++/52433 PR libstdc++/52433

60
libstdc++-v3/doc/doxygen/user.cfg.in
View File

@ -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 # This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for a project. # doxygen (www.doxygen.org) for a project.
@ -242,6 +242,15 @@ OPTIMIZE_OUTPUT_VHDL = NO
EXTENSION_MAPPING = 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 # 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 # 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 # set this tag to YES in order to let doxygen match functions declarations and
@ -355,6 +364,10 @@ EXTRACT_ALL = NO
EXTRACT_PRIVATE = 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 # If the EXTRACT_STATIC tag is set to YES all static members of a file
# will be included in the documentation. # will be included in the documentation.
@ -1334,7 +1347,7 @@ FORMULA_TRANSPARENT = YES
# (see http://www.mathjax.org) which uses client side Javascript for the # (see http://www.mathjax.org) which uses client side Javascript for the
# rendering instead of using prerendered bitmaps. Use this if you do not # 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 # 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. # configure the path to it using the MATHJAX_RELPATH option.
USE_MATHJAX = NO USE_MATHJAX = NO
@ -1343,10 +1356,11 @@ USE_MATHJAX = NO
# HTML output directory using the MATHJAX_RELPATH option. The destination # HTML output directory using the MATHJAX_RELPATH option. The destination
# directory should contain the MathJax.js script. For instance, if the mathjax # 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 # 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_RELPATH should be ../mathjax. The default value points to
# mathjax.org site, so you can quickly see the result without installing # the MathJax Content Delivery Network so you can quickly see the result without
# MathJax, but it is strongly recommended to install a local copy of MathJax # installing MathJax.
# before deployment. # 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 MATHJAX_RELPATH = http://www.mathjax.org/mathjax
@ -1683,7 +1697,6 @@ PREDEFINED = __cplusplus \
"_GLIBCXX_PURE= " \ "_GLIBCXX_PURE= " \
"_GLIBCXX_CONST= " \ "_GLIBCXX_CONST= " \
"_GLIBCXX_NORETURN= " \ "_GLIBCXX_NORETURN= " \
"_GLIBCXX_NOTHROW= " \
"_GLIBCXX_STD_C= " \ "_GLIBCXX_STD_C= " \
"_GLIBCXX_STD_A= " \ "_GLIBCXX_STD_A= " \
"_GLIBCXX_VISIBILITY(V)= " \ "_GLIBCXX_VISIBILITY(V)= " \
@ -1699,6 +1712,10 @@ PREDEFINED = __cplusplus \
_GLIBCXX_DEPRECATED \ _GLIBCXX_DEPRECATED \
_GLIBCXX_CONSTEXPR=constexpr \ _GLIBCXX_CONSTEXPR=constexpr \
_GLIBCXX_USE_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_WCHAR_T \
_GLIBCXX_USE_LONG_LONG \ _GLIBCXX_USE_LONG_LONG \
_GLIBCXX_USE_C99_STDINT_TR1 \ _GLIBCXX_USE_C99_STDINT_TR1 \
@ -1708,6 +1725,8 @@ PREDEFINED = __cplusplus \
__GXX_RTTI \ __GXX_RTTI \
ATOMIC_INT_LOCK_FREE \ ATOMIC_INT_LOCK_FREE \
PB_DS_DATA_TRUE_INDICATOR \ PB_DS_DATA_TRUE_INDICATOR \
PB_DS_STATIC_ASSERT=// \
"_GLIBCXX_BEGIN_NAMESPACE_ALGO= " \
__glibcxx_function_requires=// \ __glibcxx_function_requires=// \
__glibcxx_class_requires=// \ __glibcxx_class_requires=// \
__glibcxx_class_requires2=// \ __glibcxx_class_requires2=// \
@ -1733,22 +1752,18 @@ SKIP_FUNCTION_MACROS = YES
# Configuration::additions related to external references # Configuration::additions related to external references
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# The TAGFILES option can be used to specify one or more tagfiles. # The TAGFILES option can be used to specify one or more tagfiles. For each
# Optionally an initial location of the external documentation # tag file the location of the external documentation should be added. The
# can be added for each tagfile. The format of a tag file without # format of a tag file without this location is as follows:
# this location is as follows:
# #
# TAGFILES = file1 file2 ... # TAGFILES = file1 file2 ...
# Adding location for the tag files is done as follows: # Adding location for the tag files is done as follows:
# #
# TAGFILES = file1=loc1 "file2 = loc2" ... # TAGFILES = file1=loc1 "file2 = loc2" ...
# where "loc1" and "loc2" can be relative or absolute paths or # where "loc1" and "loc2" can be relative or absolute paths
# URLs. If a location is present for each tag, the installdox tool # or URLs. Note that each tag file must have a unique name (where the name does
# does not have to be run to correct the links. # NOT include the path). If a tag file is not located in the directory in which
# Note that each tag file must have a unique name # doxygen is run, you must also specify the path to the tagfile here.
# (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 = TAGFILES =
@ -1861,6 +1876,15 @@ GROUP_GRAPHS = YES
UML_LOOK = NO 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 # If set to YES, the inheritance and collaboration graphs will show the
# relations between templates and their instances. # relations between templates and their instances.

35
libstdc++-v3/include/bits/locale_facets.h
View File

@ -1,7 +1,7 @@
// Locale support -*- C++ -*- // Locale support -*- C++ -*-
// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, // 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. // Free Software Foundation, Inc.
// //
// This file is part of the GNU ISO C++ Library. This library is free // This file is part of the GNU ISO C++ Library. This library is free
@ -1981,9 +1981,10 @@ _GLIBCXX_BEGIN_NAMESPACE_LDBL
* specifier. Otherwise, parses like %d for signed and %u for unsigned * specifier. Otherwise, parses like %d for signed and %u for unsigned
* types. The matching type length modifier is also used. * types. The matching type length modifier is also used.
* *
* Digit grouping is interpreted according to numpunct::grouping() and * Digit grouping is interpreted according to
* numpunct::thousands_sep(). If the pattern of digit groups isn't * numpunct::grouping() and numpunct::thousands_sep(). If the
* consistent, sets err to ios_base::failbit. * 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. * 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. * 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. * matching type length modifier is also used.
* *
* The decimal point character used is numpunct::decimal_point(). * The decimal point character used is numpunct::decimal_point().
* Digit grouping is interpreted according to numpunct::grouping() and * Digit grouping is interpreted according to
* numpunct::thousands_sep(). If the pattern of digit groups isn't * numpunct::grouping() and numpunct::thousands_sep(). If the
* consistent, sets err to ios_base::failbit. * 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. * 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. * 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. * The input characters are parsed like the scanf %p specifier.
* *
* Digit grouping is interpreted according to numpunct::grouping() and * Digit grouping is interpreted according to
* numpunct::thousands_sep(). If the pattern of digit groups isn't * numpunct::grouping() and numpunct::thousands_sep(). If the
* consistent, sets err to ios_base::failbit. * 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 * Note that the digit grouping effect for pointers is a bit ambiguous
* in the standard and shouldn't be relied on. See DR 344. * in the standard and shouldn't be relied on. See DR 344.
@ -2313,9 +2316,9 @@ _GLIBCXX_BEGIN_NAMESPACE_LDBL
* If ios_base::showbase is set, '0' precedes octal values (except 0) * If ios_base::showbase is set, '0' precedes octal values (except 0)
* and '0[xX]' precedes hex values. * and '0[xX]' precedes hex values.
* *
* Thousands separators are inserted according to numpunct::grouping() * The decimal point character used is numpunct::decimal_point().
* and numpunct::thousands_sep(). The decimal point character used is * Thousands separators are inserted according to
* numpunct::decimal_point(). * numpunct::grouping() and numpunct::thousands_sep().
* *
* If io.width() is non-zero, enough @a fill characters are inserted to * If io.width() is non-zero, enough @a fill characters are inserted to
* make the result at least that wide. If * 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 * If ios_base::showpoint is set, a decimal point will always be
* output. * output.
* *
* Thousands separators are inserted according to numpunct::grouping() * The decimal point character used is numpunct::decimal_point().
* and numpunct::thousands_sep(). The decimal point character used is * Thousands separators are inserted according to
* numpunct::decimal_point(). * numpunct::grouping() and numpunct::thousands_sep().
* *
* If io.width() is non-zero, enough @a fill characters are inserted to * If io.width() is non-zero, enough @a fill characters are inserted to
* make the result at least that wide. If * make the result at least that wide. If

10
libstdc++-v3/include/ext/pb_ds/assoc_container.hpp
View File

@ -57,7 +57,7 @@ namespace __gnu_pbds
*/ */
/** /**
* @defgroup hash-based * @defgroup hash-based Hash-Based
* @ingroup containers-pbds * @ingroup containers-pbds
* @{ * @{
*/ */
@ -521,7 +521,7 @@ namespace __gnu_pbds
/** /**
* @defgroup branch-based * @defgroup branch-based Branch-Based
* @ingroup containers-pbds * @ingroup containers-pbds
* @{ * @{
*/ */
@ -617,7 +617,7 @@ namespace __gnu_pbds
* @tparam Cmp_Fn Comparison functor. * @tparam Cmp_Fn Comparison functor.
* @tparam Tag Instantiating data structure type, * @tparam Tag Instantiating data structure type,
* see container_tag. * see container_tag.
* @tparam Node_Update Updates nodes, * @tparam Node_Update Updates tree internal-nodes,
* restores invariants when invalidated. * restores invariants when invalidated.
* XXX See design::tree-based-containers::node invariants. * XXX See design::tree-based-containers::node invariants.
* @tparam _Alloc Allocator type. * @tparam _Alloc Allocator type.
@ -708,7 +708,7 @@ namespace __gnu_pbds
* @tparam _ATraits Element access traits. * @tparam _ATraits Element access traits.
* @tparam Tag Instantiating data structure type, * @tparam Tag Instantiating data structure type,
* see container_tag. * see container_tag.
* @tparam Node_Update Updates trie nodes, * @tparam Node_Update Updates trie internal-nodes,
* restores invariants when invalidated. * restores invariants when invalidated.
* XXX See design::tree-based-containers::node invariants. * XXX See design::tree-based-containers::node invariants.
* @tparam _Alloc Allocator type. * @tparam _Alloc Allocator type.
@ -786,7 +786,7 @@ namespace __gnu_pbds
/** /**
* @defgroup list-based * @defgroup list-based List-Based
* @ingroup containers-pbds * @ingroup containers-pbds
* @{ * @{
*/ */

2
libstdc++-v3/include/ext/pb_ds/priority_queue.hpp
View File

@ -49,7 +49,7 @@
namespace __gnu_pbds namespace __gnu_pbds
{ {
/** /**
* @defgroup heap-based * @defgroup heap-based Heap-Based
* @ingroup containers-pbds * @ingroup containers-pbds
* @{ * @{
*/ */

8
libstdc++-v3/include/std/fstream
View File

@ -232,7 +232,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
* *
* If a file is already open, this function immediately fails. * If a file is already open, this function immediately fails.
* Otherwise it tries to open the file named @a __s using the flags * 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 * Table 92, adapted here, gives the relation between openmode
* combinations and the equivalent fopen() flags. * combinations and the equivalent fopen() flags.
@ -619,8 +619,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
* @param __s Null terminated string specifying the filename. * @param __s Null terminated string specifying the filename.
* @param __mode Open file in specified mode (see std::ios_base). * @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
* @p __mode. * @a __mode.
* *
* Tip: When using std::string to hold the filename, you must use * Tip: When using std::string to hold the filename, you must use
* .c_str() before passing it to this constructor. * .c_str() before passing it to this constructor.
@ -640,7 +640,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
* @param __s std::string specifying the filename. * @param __s std::string specifying the filename.
* @param __mode Open file in specified mode (see std::ios_base). * @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. * @a __mode.
*/ */
explicit explicit

3
libstdc++-v3/include/std/ratio
View File

@ -62,9 +62,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
: integral_constant<intmax_t, _Pn * __static_sign<_Pn>::value> : integral_constant<intmax_t, _Pn * __static_sign<_Pn>::value>
{ }; { };
template<intmax_t _Pn, intmax_t _Qn>
struct __static_gcd;
template<intmax_t _Pn, intmax_t _Qn> template<intmax_t _Pn, intmax_t _Qn>
struct __static_gcd struct __static_gcd
: __static_gcd<_Qn, (_Pn % _Qn)> : __static_gcd<_Qn, (_Pn % _Qn)>

4
libstdc++-v3/testsuite/20_util/ratio/cons/cons_overflow_neg.cc
View File

@ -49,7 +49,7 @@ test04()
// { dg-error "required from here" "" { target *-*-* } 34 } // { dg-error "required from here" "" { target *-*-* } 34 }
// { dg-error "required from here" "" { target *-*-* } 40 } // { dg-error "required from here" "" { target *-*-* } 40 }
// { dg-error "required from here" "" { target *-*-* } 46 } // { dg-error "required from here" "" { target *-*-* } 46 }
// { dg-error "denominator cannot be zero" "" { target *-*-* } 268 } // { dg-error "denominator cannot be zero" "" { target *-*-* } 265 }
// { dg-error "out of range" "" { target *-*-* } 269 } // { dg-error "out of range" "" { target *-*-* } 266 }
// { dg-error "overflow in constant expression" "" { target *-*-* } 61 } // { dg-error "overflow in constant expression" "" { target *-*-* } 61 }
// { dg-prune-output "not a member" } // { dg-prune-output "not a member" }

8
libstdc++-v3/testsuite/20_util/ratio/operations/ops_overflow_neg.cc
View File

@ -42,9 +42,9 @@ test02()
// { dg-error "required from here" "" { target *-*-* } 29 } // { dg-error "required from here" "" { target *-*-* } 29 }
// { dg-error "required from here" "" { target *-*-* } 36 } // { dg-error "required from here" "" { target *-*-* } 36 }
// { dg-error "required from here" "" { target *-*-* } 38 } // { dg-error "required from here" "" { target *-*-* } 38 }
// { dg-error "overflow in addition" "" { target *-*-* } 432 } // { dg-error "overflow in addition" "" { target *-*-* } 429 }
// { dg-error "overflow in multiplication" "" { target *-*-* } 104 } // { dg-error "overflow in multiplication" "" { target *-*-* } 97 }
// { dg-error "overflow in multiplication" "" { target *-*-* } 100 } // { dg-error "overflow in multiplication" "" { target *-*-* } 99 }
// { dg-error "overflow in multiplication" "" { target *-*-* } 102 } // { dg-error "overflow in multiplication" "" { target *-*-* } 101 }
// { dg-prune-output "out of range" } // { dg-prune-output "out of range" }
// { dg-prune-output "not usable in a constant expression" } // { dg-prune-output "not usable in a constant expression" }