+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.
# 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}`; \
${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; \
# 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
${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; \
/*
- 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
* 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
<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.
<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.
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 \
*/
/**
- * @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
*/
/**
- * @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
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
*/
/**
- * @addtogroup random_distributions_uniform Uniform Distributions
+ * @addtogroup random_distributions_uniform Uniform
* @ingroup random_distributions
* @{
*/
/* @} */ // group random_distributions_uniform
/**
- * @addtogroup random_distributions_normal Normal Distributions
+ * @addtogroup random_distributions_normal Normal
* @ingroup random_distributions
* @{
*/
/* @} */ // group random_distributions_normal
/**
- * @addtogroup random_distributions_bernoulli Bernoulli Distributions
+ * @addtogroup random_distributions_bernoulli Bernoulli
* @ingroup random_distributions
* @{
*/
/* @} */ // group random_distributions_bernoulli
/**
- * @addtogroup random_distributions_poisson Poisson Distributions
+ * @addtogroup random_distributions_poisson Poisson
* @ingroup random_distributions
* @{
*/
// <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.
*/
_GLIBCXX_BEGIN_NAMESPACE(std)
/**
- * @defgroup heap_algorithms Heap Algorithms
+ * @defgroup heap_algorithms Heap
* @ingroup sorting_algorithms
*/
OSDN Git Service
