From 0121f44708be8ff14d42356fe3f41e7db53d69ec Mon Sep 17 00:00:00 2001
From: bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 3 Mar 2005 17:45:44 +0000
Subject: [PATCH] 2005-03-03  Benjamin Kosnik  <bkoz@redhat.com>

	* include/tr1/functional: Convert relative path.

	* docs/doxygen/user.cfg.in: Add tr1 includes.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@95838 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libstdc++-v3/ChangeLog                |  6 ++++++
 libstdc++-v3/docs/doxygen/user.cfg.in | 10 +++++++++-
 libstdc++-v3/include/tr1/functional   |  2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 22a7ed4fdb0..8acc3271c8d 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-03  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* include/tr1/functional: Convert relative path.
+
+	* docs/doxygen/user.cfg.in: Add tr1 includes.
+
 2005-03-03  Paolo Carlini  <pcarlini@suse.de>
 
 	* include/tr1/type_traits: Implemenet is_polymorphic.
diff --git a/libstdc++-v3/docs/doxygen/user.cfg.in b/libstdc++-v3/docs/doxygen/user.cfg.in
index 4e149d7b8be..dc4595b21ae 100644
--- a/libstdc++-v3/docs/doxygen/user.cfg.in
+++ b/libstdc++-v3/docs/doxygen/user.cfg.in
@@ -73,6 +73,7 @@ INPUT                  = @srcdir@/docs/doxygen/doxygroups.cc \
 			 include/@host_alias@/bits \
                          include/bits \
                          include/ext \
+                         include/tr1 \
                          @srcdir@/libsupc++/exception \
                          @srcdir@/libsupc++/new \
                          @srcdir@/libsupc++/typeinfo \
@@ -113,7 +114,14 @@ INPUT                  = @srcdir@/docs/doxygen/doxygroups.cc \
                          include/ext/rope \
                          include/ext/slist \
                          include/tr1/array \
-                         include/tr1/tuple 
+                         include/tr1/functional \
+                         include/tr1/hashtable \
+                         include/tr1/memory \
+                         include/tr1/tuple \
+                         include/tr1/type_traits \
+                         include/tr1/unordered_map \
+                         include/tr1/unordered_set \
+                         include/tr1/utility 
 FILE_PATTERNS          = *.h \
                          *.tcc
 RECURSIVE              = NO
diff --git a/libstdc++-v3/include/tr1/functional b/libstdc++-v3/include/tr1/functional
index 30a79871ac8..778b9d7ef9a 100644
--- a/libstdc++-v3/include/tr1/functional
+++ b/libstdc++-v3/include/tr1/functional
@@ -37,7 +37,7 @@
 #include "../functional"
 #include <typeinfo>
 #include <tr1/type_traits>
-#include "../bits/cpp_type_traits.h"
+#include <bits/cpp_type_traits.h>
 #include <string>               // for std::tr1::hash
 #include <cstdlib>              // for std::abort
 
-- 
2.11.0