From 7f55dd083b55f09bcc5940668f7d52780551e95c Mon Sep 17 00:00:00 2001 From: bkoz Date: Thu, 8 Jul 2010 17:48:12 +0000 Subject: [PATCH] 2010-07-08 Benjamin Kosnik * include/bits/stl_heap.h: Update markup. * include/bits/move.h: Same. * include/bits/algorithmfwd.h: Same. * include/bits/regex.h: Same. * include/bits/random.h: Same. * doc/doxygen/doxygroups.cc: Same. * doc/doxygen/user.cfg.in: Remove include/tr1_impl/regex from input file list. * doc/Makefile.am (doc-pdf-doxygen): Add comment, put generated pdf in location consistent with docbook pdf generation. * doc/Makefile.in: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@161970 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 14 ++++++++++++++ libstdc++-v3/doc/Makefile.am | 18 ++++++++++++++---- libstdc++-v3/doc/Makefile.in | 16 +++++++++++++--- libstdc++-v3/doc/doxygen/doxygroups.cc | 9 +++++---- libstdc++-v3/doc/doxygen/user.cfg.in | 1 - libstdc++-v3/include/bits/algorithmfwd.h | 10 +++++----- libstdc++-v3/include/bits/move.h | 2 +- libstdc++-v3/include/bits/random.h | 8 ++++---- libstdc++-v3/include/bits/regex.h | 2 +- libstdc++-v3/include/bits/stl_heap.h | 2 +- 10 files changed, 58 insertions(+), 24 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 6ab9e0b232b..ed1e4096dea 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,17 @@ +2010-07-08 Benjamin Kosnik + + * include/bits/stl_heap.h: Update markup. + * include/bits/move.h: Same. + * include/bits/algorithmfwd.h: Same. + * include/bits/regex.h: Same. + * include/bits/random.h: Same. + * doc/doxygen/doxygroups.cc: Same. + * doc/doxygen/user.cfg.in: Remove include/tr1_impl/regex from + input file list. + * doc/Makefile.am (doc-pdf-doxygen): Add comment, put generated + pdf in location consistent with docbook pdf generation. + * doc/Makefile.in: Regenerate. + 2010-07-06 Jonathan Wakely * doc/xml/manual/status_cxx200x.xml: Add some missing features. diff --git a/libstdc++-v3/doc/Makefile.am b/libstdc++-v3/doc/Makefile.am index d48e7a30de8..7642cfdff80 100644 --- a/libstdc++-v3/doc/Makefile.am +++ b/libstdc++-v3/doc/Makefile.am @@ -44,7 +44,6 @@ doc-html: doc-html-docbook # Assumes doxygen, graphviz (with dot), pdflatex installed doxygen_script=${top_srcdir}/scripts/run_doxygen doxygen_outdir = ${glibcxx_builddir}/doc/doxygen -doxygen_pdf = ${doxygen_outdir}/latex/refman.pdf doc-html-doxygen: -(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \ @@ -75,12 +74,23 @@ doc-latex-doxygen: ${SHELL} ${doxygen_script} \ --host_alias=${host_alias} --mode=latex $${srcdir} $${builddir} NO) -# Chance of loooooonnggg creation time on this rule. -doc-pdf-doxygen: stamp-latex-doxygen +# Chance of loooooonnggg creation time on this rule. Iff this fails, +# look at refman.log and see if TeX's memory is exhausted. Symptoms +# include asking a wizard to enlarge capacity. If this is the case, +# find texmf.cnf and add a zero for pool_size, string_vacancies, +# max_strings, and pool_free values. +doxygen_pdf = ${doxygen_outdir}/latex/refman.pdf +api_pdf = ${doxygen_outdir}/pdf/libstdc++-api.pdf + +${doxygen_outdir}/pdf: + mkdir -p ${doxygen_outdir}/pdf + +doc-pdf-doxygen: stamp-latex-doxygen ${doxygen_outdir}/pdf -(cd ${doxygen_outdir}/latex && $(MAKE) -i pdf;) echo "Generating doxygen pdf file..."; if [ -f ${doxygen_pdf} ]; then \ - echo "... ${doxygen_pdf}"; \ + mv ${doxygen_pdf} ${api_pdf} ; \ + echo ":: PDF file is ${api_pdf}"; \ else \ echo "... error"; \ exit 12; \ diff --git a/libstdc++-v3/doc/Makefile.in b/libstdc++-v3/doc/Makefile.in index 555b8f02b4b..9f033fafa6a 100644 --- a/libstdc++-v3/doc/Makefile.in +++ b/libstdc++-v3/doc/Makefile.in @@ -267,7 +267,14 @@ AM_CPPFLAGS = $(GLIBCXX_INCLUDES) # Assumes doxygen, graphviz (with dot), pdflatex installed doxygen_script = ${top_srcdir}/scripts/run_doxygen doxygen_outdir = ${glibcxx_builddir}/doc/doxygen + +# Chance of loooooonnggg creation time on this rule. Iff this fails, +# look at refman.log and see if TeX's memory is exhausted. Symptoms +# include asking a wizard to enlarge capacity. If this is the case, +# find texmf.cnf and add a zero for pool_size, string_vacancies, +# max_strings, and pool_free values. doxygen_pdf = ${doxygen_outdir}/latex/refman.pdf +api_pdf = ${doxygen_outdir}/pdf/libstdc++-api.pdf # Docbook configuration. # Assumes @@ -597,12 +604,15 @@ doc-latex-doxygen: ${SHELL} ${doxygen_script} \ --host_alias=${host_alias} --mode=latex $${srcdir} $${builddir} NO) -# Chance of loooooonnggg creation time on this rule. -doc-pdf-doxygen: stamp-latex-doxygen +${doxygen_outdir}/pdf: + mkdir -p ${doxygen_outdir}/pdf + +doc-pdf-doxygen: stamp-latex-doxygen ${doxygen_outdir}/pdf -(cd ${doxygen_outdir}/latex && $(MAKE) -i pdf;) echo "Generating doxygen pdf file..."; if [ -f ${doxygen_pdf} ]; then \ - echo "... ${doxygen_pdf}"; \ + mv ${doxygen_pdf} ${api_pdf} ; \ + echo ":: PDF file is ${api_pdf}"; \ else \ echo "... error"; \ exit 12; \ diff --git a/libstdc++-v3/doc/doxygen/doxygroups.cc b/libstdc++-v3/doc/doxygen/doxygroups.cc index e7c664a92fb..00175388301 100644 --- a/libstdc++-v3/doc/doxygen/doxygroups.cc +++ b/libstdc++-v3/doc/doxygen/doxygroups.cc @@ -1,5 +1,6 @@ /* - Copyright (C) 2001, 2002, 2005, 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2005, 2008, 2009, 2010 + Free Software Foundation, Inc. See license.html for license. This just provides documentation for stuff that doesn't need to be in the @@ -47,7 +48,7 @@ * Components generally useful that are not part of any standard. */ -/** @defgroup SGIextensions SGI STL extensions +/** @defgroup SGIextensions SGI * @ingroup extensions Because libstdc++ based its implementation of the STL subsections of the library on the SGI 3.3 implementation, we inherited their extensions @@ -115,7 +116,7 @@ All sequences must meet certain requirements, summarized in tables. */ -/** @defgroup associative_containers Associative Containers +/** @defgroup associative_containers Associative * @ingroup containers Associative containers allow fast retrieval of data based on keys. @@ -126,7 +127,7 @@ All associative containers must meet certain requirements, summarized in tables. */ -/** @defgroup unordered_associative_containers Unordered Associative Containers +/** @defgroup unordered_associative_containers Unordered Associative * @ingroup containers Unordered associative containers allow fast retrieval of data based on keys. diff --git a/libstdc++-v3/doc/doxygen/user.cfg.in b/libstdc++-v3/doc/doxygen/user.cfg.in index 118f9e78975..2699f6a3294 100644 --- a/libstdc++-v3/doc/doxygen/user.cfg.in +++ b/libstdc++-v3/doc/doxygen/user.cfg.in @@ -721,7 +721,6 @@ INPUT = @srcdir@/doc/doxygen/doxygroups.cc \ include/tr1_impl/cstdlib \ include/tr1_impl/cwchar \ include/tr1_impl/cwctype \ - include/tr1_impl/regex \ include/tr1_impl/type_traits \ include/tr1_impl/utility \ include/tr1_impl \ diff --git a/libstdc++-v3/include/bits/algorithmfwd.h b/libstdc++-v3/include/bits/algorithmfwd.h index 645d8830fd8..cbd7f6fe20e 100644 --- a/libstdc++-v3/include/bits/algorithmfwd.h +++ b/libstdc++-v3/include/bits/algorithmfwd.h @@ -134,22 +134,22 @@ _GLIBCXX_BEGIN_NAMESPACE(std) */ /** - * @defgroup mutating_algorithms Mutating Algorithms + * @defgroup mutating_algorithms Mutating * @ingroup algorithms */ /** - * @defgroup non_mutating_algorithms Non-Mutating Algorithms + * @defgroup non_mutating_algorithms Non-Mutating * @ingroup algorithms */ /** - * @defgroup sorting_algorithms Sorting Algorithms + * @defgroup sorting_algorithms Sorting * @ingroup algorithms */ /** - * @defgroup set_algorithms Set Operation Algorithms + * @defgroup set_algorithms Set Operation * @ingroup sorting_algorithms * * These algorithms are common set operations performed on sequences @@ -158,7 +158,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) */ /** - * @defgroup binary_search_algorithms Binary Search Algorithms + * @defgroup binary_search_algorithms Binary Search * @ingroup sorting_algorithms * * These algorithms are variations of a classic binary search, and diff --git a/libstdc++-v3/include/bits/move.h b/libstdc++-v3/include/bits/move.h index 98755dc7e57..09b9c85b07f 100644 --- a/libstdc++-v3/include/bits/move.h +++ b/libstdc++-v3/include/bits/move.h @@ -93,7 +93,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) move(_Tp&& __t) { return static_cast::type&&>(__t); } - /// declval, defined in . + /// declval, from type_traits. /** * @brief Returns the actual address of the object or function diff --git a/libstdc++-v3/include/bits/random.h b/libstdc++-v3/include/bits/random.h index cc950f03ae2..aa21a10ca55 100644 --- a/libstdc++-v3/include/bits/random.h +++ b/libstdc++-v3/include/bits/random.h @@ -1614,7 +1614,7 @@ namespace std */ /** - * @addtogroup random_distributions_uniform Uniform Distributions + * @addtogroup random_distributions_uniform Uniform * @ingroup random_distributions * @{ */ @@ -1972,7 +1972,7 @@ namespace std /* @} */ // group random_distributions_uniform /** - * @addtogroup random_distributions_normal Normal Distributions + * @addtogroup random_distributions_normal Normal * @ingroup random_distributions * @{ */ @@ -3226,7 +3226,7 @@ namespace std /* @} */ // group random_distributions_normal /** - * @addtogroup random_distributions_bernoulli Bernoulli Distributions + * @addtogroup random_distributions_bernoulli Bernoulli * @ingroup random_distributions * @{ */ @@ -3957,7 +3957,7 @@ namespace std /* @} */ // group random_distributions_bernoulli /** - * @addtogroup random_distributions_poisson Poisson Distributions + * @addtogroup random_distributions_poisson Poisson * @ingroup random_distributions * @{ */ diff --git a/libstdc++-v3/include/bits/regex.h b/libstdc++-v3/include/bits/regex.h index f035fd4ade4..bbec88cb7ff 100644 --- a/libstdc++-v3/include/bits/regex.h +++ b/libstdc++-v3/include/bits/regex.h @@ -23,7 +23,7 @@ // . /** - * @file bits/regex + * @file bits/regex.h * This is an internal header file, included by other library headers. * You should not attempt to use it directly. */ diff --git a/libstdc++-v3/include/bits/stl_heap.h b/libstdc++-v3/include/bits/stl_heap.h index 9348fe9702f..b52fa7a91e0 100644 --- a/libstdc++-v3/include/bits/stl_heap.h +++ b/libstdc++-v3/include/bits/stl_heap.h @@ -62,7 +62,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /** - * @defgroup heap_algorithms Heap Algorithms + * @defgroup heap_algorithms Heap * @ingroup sorting_algorithms */ -- 2.11.0