From 30f276c1dc32c199f42be0efd4b79771768ce40d Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Tue, 1 Feb 2011 01:31:42 +0000 Subject: [PATCH] run_doxygen: Allow doxygen 1.7.0 again. 2011-02-01 Benjamin Kosnik * scripts/run_doxygen: Allow doxygen 1.7.0 again. * doc/doxygen/user.cfg.in (PDF_HYPERLINKS): Re-enable. (COMPACT_LATEX): Enable. * include/profile/impl/profiler_container_size.h: Adjust doxygen markup. * include/profile/impl/profiler_hash_func.h: Same. * include/bits/hashtable.h: Same. * include/backward/auto_ptr.h: Same. * include/backward/strstream: Same. * include/backward/backward_warning.h: Same. * include/backward/binders.h: Same. From-SVN: r169464 --- libstdc++-v3/ChangeLog | 14 ++++++++++++++ libstdc++-v3/doc/doxygen/user.cfg.in | 8 ++------ libstdc++-v3/include/backward/auto_ptr.h | 2 +- libstdc++-v3/include/backward/backward_warning.h | 7 ++++++- libstdc++-v3/include/backward/binders.h | 2 +- libstdc++-v3/include/backward/strstream | 7 ++++++- libstdc++-v3/include/bits/hashtable.h | 3 +-- .../include/profile/impl/profiler_container_size.h | 4 ++-- .../include/profile/impl/profiler_hash_func.h | 4 ++-- libstdc++-v3/scripts/run_doxygen | 4 ++-- 10 files changed, 37 insertions(+), 18 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 5c7ce9de528..cbb23f5cf7e 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,17 @@ +2011-02-01 Benjamin Kosnik + + * scripts/run_doxygen: Allow doxygen 1.7.0 again. + * doc/doxygen/user.cfg.in (PDF_HYPERLINKS): Re-enable. + (COMPACT_LATEX): Enable. + + * include/profile/impl/profiler_container_size.h: Adjust doxygen markup. + * include/profile/impl/profiler_hash_func.h: Same. + * include/bits/hashtable.h: Same. + * include/backward/auto_ptr.h: Same. + * include/backward/strstream: Same. + * include/backward/backward_warning.h: Same. + * include/backward/binders.h: Same. + 2011-02-01 Gerald Pfeifer * doc/xml/manual/debug.xml: Use GDB instead of gdb. diff --git a/libstdc++-v3/doc/doxygen/user.cfg.in b/libstdc++-v3/doc/doxygen/user.cfg.in index d9990c97842..920a4cd4acf 100644 --- a/libstdc++-v3/doc/doxygen/user.cfg.in +++ b/libstdc++-v3/doc/doxygen/user.cfg.in @@ -586,12 +586,8 @@ WARN_LOGFILE = INPUT = @srcdir@/doc/doxygen/doxygroups.cc \ @srcdir@/libsupc++/cxxabi.h \ - @srcdir@/libsupc++/cxxabi_forced.h \ @srcdir@/libsupc++/exception \ - @srcdir@/libsupc++/exception_defines.h \ - @srcdir@/libsupc++/exception_ptr.h \ @srcdir@/libsupc++/initializer_list \ - @srcdir@/libsupc++/nested_exception.h \ @srcdir@/libsupc++/new \ @srcdir@/libsupc++/typeinfo \ include/algorithm \ @@ -1279,7 +1275,7 @@ MAKEINDEX_CMD_NAME = makeindex # LaTeX documents. This may be useful for small projects and may help to # save some trees in general. -COMPACT_LATEX = NO +COMPACT_LATEX = YES # The PAPER_TYPE tag can be used to set the paper type that is used # by the printer. Possible values are: a4, letter, legal and @@ -1304,7 +1300,7 @@ LATEX_HEADER = # contain links (just like the HTML output) instead of page references # This makes the output suitable for online browsing using a pdf viewer. -PDF_HYPERLINKS = NO +PDF_HYPERLINKS = YES # If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of # plain latex in the generated Makefile. Set this option to YES to get a diff --git a/libstdc++-v3/include/backward/auto_ptr.h b/libstdc++-v3/include/backward/auto_ptr.h index 60d4e623e02..e8687651034 100644 --- a/libstdc++-v3/include/backward/auto_ptr.h +++ b/libstdc++-v3/include/backward/auto_ptr.h @@ -24,7 +24,7 @@ /** @file backward/auto_ptr.h * This is an internal header file, included by other library headers. - * You should not attempt to use it directly. + * Do not attempt to use it directly. @headername{memory} */ #ifndef _BACKWARD_AUTO_PTR_H diff --git a/libstdc++-v3/include/backward/backward_warning.h b/libstdc++-v3/include/backward/backward_warning.h index 53df521cb1c..77dff054c87 100644 --- a/libstdc++-v3/include/backward/backward_warning.h +++ b/libstdc++-v3/include/backward/backward_warning.h @@ -1,4 +1,4 @@ -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2011 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -21,6 +21,11 @@ // see the files COPYING3 and COPYING.RUNTIME respectively. If not, see // . +/** @file backward/backward_warning.h + * This is an internal header file, included by other library headers. + * Do not attempt to use it directly. @headername{iosfwd} + */ + #ifndef _BACKWARD_BACKWARD_WARNING_H #define _BACKWARD_BACKWARD_WARNING_H 1 diff --git a/libstdc++-v3/include/backward/binders.h b/libstdc++-v3/include/backward/binders.h index 75e091eb6db..f98b56aaede 100644 --- a/libstdc++-v3/include/backward/binders.h +++ b/libstdc++-v3/include/backward/binders.h @@ -51,7 +51,7 @@ /** @file backward/binders.h * This is an internal header file, included by other library headers. - * You should not attempt to use it directly. + * Do not attempt to use it directly. @headername{functional} */ #ifndef _BACKWARD_BINDERS_H diff --git a/libstdc++-v3/include/backward/strstream b/libstdc++-v3/include/backward/strstream index 964c455873a..7e18a359cc4 100644 --- a/libstdc++-v3/include/backward/strstream +++ b/libstdc++-v3/include/backward/strstream @@ -1,6 +1,6 @@ // Backward-compat support -*- C++ -*- -// Copyright (C) 2001, 2002, 2004, 2005, 2009, 2010 +// Copyright (C) 2001, 2002, 2004, 2005, 2009, 2010, 2011 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -41,6 +41,11 @@ // MAY BE REMOVED in a future standard revision. One should use the // header instead. +/** @file backward/strstream + * This is an internal header file, included by other library headers. + * Do not attempt to use it directly. @headername{sstream} + */ + #ifndef _BACKWARD_STRSTREAM #define _BACKWARD_STRSTREAM diff --git a/libstdc++-v3/include/bits/hashtable.h b/libstdc++-v3/include/bits/hashtable.h index 2ee85524eff..f284126e247 100644 --- a/libstdc++-v3/include/bits/hashtable.h +++ b/libstdc++-v3/include/bits/hashtable.h @@ -24,8 +24,7 @@ /** @file bits/hashtable.h * This is an internal header file, included by other library headers. - * You should not attempt to use it directly. - * @headername{unordered_map, unordered_set} + * Do not attempt to use it directly. @headername{unordered_map, unordered_set} */ #ifndef _HASHTABLE_H diff --git a/libstdc++-v3/include/profile/impl/profiler_container_size.h b/libstdc++-v3/include/profile/impl/profiler_container_size.h index 5c7d08b92b9..12cee549695 100644 --- a/libstdc++-v3/include/profile/impl/profiler_container_size.h +++ b/libstdc++-v3/include/profile/impl/profiler_container_size.h @@ -1,6 +1,6 @@ // -*- C++ -*- // -// Copyright (C) 2009, 2010 Free Software Foundation, Inc. +// Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -28,7 +28,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/** @file profile/impl/profiler_trace.h +/** @file profile/impl/profiler_container_size.h * @brief Diagnostics for container sizes. */ diff --git a/libstdc++-v3/include/profile/impl/profiler_hash_func.h b/libstdc++-v3/include/profile/impl/profiler_hash_func.h index 3e01760afba..9f6c6416992 100644 --- a/libstdc++-v3/include/profile/impl/profiler_hash_func.h +++ b/libstdc++-v3/include/profile/impl/profiler_hash_func.h @@ -1,6 +1,6 @@ // -*- C++ -*- // -// Copyright (C) 2009, 2010 Free Software Foundation, Inc. +// Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -28,7 +28,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/** @file profile/impl/profiler_trace.h +/** @file profile/impl/profiler_hash_func.h * @brief Data structures to represent profiling traces. */ diff --git a/libstdc++-v3/scripts/run_doxygen b/libstdc++-v3/scripts/run_doxygen index 23930929dfc..e227ce17b95 100644 --- a/libstdc++-v3/scripts/run_doxygen +++ b/libstdc++-v3/scripts/run_doxygen @@ -1,7 +1,7 @@ #!/bin/bash # Runs doxygen and massages the output files. -# Copyright (C) 2001, 2002, 2003, 2004, 2008, 2009, 2010 +# Copyright (C) 2001, 2002, 2003, 2004, 2008, 2009, 2010, 2011 # Free Software Foundation, Inc. # # Synopsis: run_doxygen --mode=[html|latex|man|xml] --host_alias= \ @@ -13,7 +13,7 @@ # We can check now that the version of doxygen is >= this variable. -DOXYVER=1.7.1 +DOXYVER=1.7.0 find_doxygen() { local -r v_required=`echo $DOXYVER | \