stl_heap.h: Update markup.

2010-07-08  Benjamin Kosnik  <bkoz@redhat.com>

	* 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.

From-SVN: r161970
This commit is contained in:
Benjamin Kosnik 2010-07-08 17:48:12 +00:00 committed by Benjamin Kosnik
parent 84fa59a70c
commit 5ab3a5af25
10 changed files with 58 additions and 24 deletions

View File

@ -1,3 +1,17 @@
2010-07-08 Benjamin Kosnik <bkoz@redhat.com>
* 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 <jwakely.gcc@gmail.com>
* doc/xml/manual/status_cxx200x.xml: Add some missing features.

View File

@ -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; \

View File

@ -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; \

View File

@ -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
<a href="tables.html">tables</a>.
*/
/** @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
<a href="tables.html">tables</a>.
*/
/** @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.

View File

@ -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 \

View File

@ -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

View File

@ -93,7 +93,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
move(_Tp&& __t)
{ return static_cast<typename std::remove_reference<_Tp>::type&&>(__t); }
/// declval, defined in <type_traits>.
/// declval, from type_traits.
/**
* @brief Returns the actual address of the object or function

View File

@ -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
* @{
*/

View File

@ -23,7 +23,7 @@
// <http://www.gnu.org/licenses/>.
/**
* @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.
*/

View File

@ -62,7 +62,7 @@
_GLIBCXX_BEGIN_NAMESPACE(std)
/**
* @defgroup heap_algorithms Heap Algorithms
* @defgroup heap_algorithms Heap
* @ingroup sorting_algorithms
*/