2002-11-21 Phil Edwards <pme@gcc.gnu.org>

	* docs/doxygen/run_doxygen:  Tighter search expression for sed.
	* docs/doxygen/stdheader.cc:  Handle the case of good headers.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@59332 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index bb524b5..c8225c7 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,10 @@
 2002-11-21  Phil Edwards  <pme@gcc.gnu.org>
 
+       * docs/doxygen/run_doxygen:  Tighter search expression for sed.
+       * docs/doxygen/stdheader.cc:  Handle the case of good headers.
+
+2002-11-21  Phil Edwards  <pme@gcc.gnu.org>
+
        * acinclude.m4:  Uniform formatting.
        * configure.in:  Warn when generic atomicity.h is used.
        * configure.target:  Fix comment.

diff --git a/libstdc++-v3/docs/doxygen/run_doxygen b/libstdc++-v3/docs/doxygen/run_doxygen
index d8ca2a9..6a0806c 100644 (file)
--- a/libstdc++-v3/docs/doxygen/run_doxygen
+++ b/libstdc++-v3/docs/doxygen/run_doxygen
@@ -208,7 +208,7 @@ g++ ${srcdir}/docs/doxygen/stdheader.cc -o ./stdheader
 problematic=`egrep -l '#include <.*_.*>' [a-z]*.3`
 for f in $problematic; do
     # this is also slow, but safe and easy to debug
-    oldh=`sed -n '/#include </s/.*<\(.*\)>.*/\1/p' $f`
+    oldh=`sed -n '/fC#include </s/.*<\(.*\)>.*/\1/p' $f`
     newh=`echo $oldh | ./stdheader`
     sed "s=${oldh}=${newh}=" $f > TEMP
     mv TEMP $f

diff --git a/libstdc++-v3/docs/doxygen/stdheader.cc b/libstdc++-v3/docs/doxygen/stdheader.cc
index d705d01..a792592 100644 (file)
--- a/libstdc++-v3/docs/doxygen/stdheader.cc
+++ b/libstdc++-v3/docs/doxygen/stdheader.cc
@@ -111,6 +111,13 @@ void do_word (std::string const& longheader)
 {
     std::string::size_type start = 0;
 
+    // if it doesn't contain a "." then it's already a std header
+    if (longheader.find(".") == std::string::npos)
+    {
+        std::cout << longheader << '\n';
+        return;
+    }
+
     if (longheader.substr(start,5) == "bits/")  start += 5;
     if ((longheader.substr(start,4) == "stl_") ||
         (longheader.substr(start,4) == "std_"))