From 36955a954f1177f75656351221074c2fac58a757 Mon Sep 17 00:00:00 2001
From: Paolo Carlini <pcarlini@unitus.it>
Date: Mon, 31 Dec 2001 19:03:47 +0100
Subject: [PATCH] algo.h: Add two more using declarations.

2001-12-31  Paolo Carlini  <pcarlini@unitus.it>

	* include/backward/algo.h:  Add two more using declarations.
	* include/backward/iterator.h:  Include <ext/iterator>,
	add using declaration.
	* include/ext/algorithm:  Add #pragma GCC system_header.

From-SVN: r48429
---
 libstdc++-v3/ChangeLog                   | 7 +++++++
 libstdc++-v3/include/backward/algo.h     | 4 +++-
 libstdc++-v3/include/backward/iterator.h | 5 ++++-
 libstdc++-v3/include/ext/algorithm       | 1 +
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 41f8178c8c3..71a370fee1a 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2001-12-31  Paolo Carlini  <pcarlini@unitus.it>
+
+	* include/backward/algo.h:  Add two more using declarations.
+	* include/backward/iterator.h:  Include <ext/iterator>,
+	add using declaration.
+	* include/ext/algorithm:  Add #pragma GCC system_header.
+
 2001-12-31  Phil Edwards  <pme@gcc.gnu.org>
 
 	* include/bits/stl_bvector.h:  Change calls to 3-argument distance()
diff --git a/libstdc++-v3/include/backward/algo.h b/libstdc++-v3/include/backward/algo.h
index 84f87011dff..185ab7811c3 100644
--- a/libstdc++-v3/include/backward/algo.h
+++ b/libstdc++-v3/include/backward/algo.h
@@ -135,7 +135,9 @@ using std::iota;
 using __gnu_cxx::random_sample; 
 using __gnu_cxx::random_sample_n;
 using __gnu_cxx::is_sorted; 
-using __gnu_cxx::is_heap; 
+using __gnu_cxx::is_heap;
+using __gnu_cxx::count;   // Extension returning void
+using __gnu_cxx::count_if;   // Extension returning void
 
 #endif /* _CPP_BACKWARD_ALGO_H */
 
diff --git a/libstdc++-v3/include/backward/iterator.h b/libstdc++-v3/include/backward/iterator.h
index d35b9420a86..8624fc28a7f 100644
--- a/libstdc++-v3/include/backward/iterator.h
+++ b/libstdc++-v3/include/backward/iterator.h
@@ -36,6 +36,8 @@
 #include <bits/stl_construct.h>
 #include <bits/stl_raw_storage_iter.h>
 
+#include <ext/iterator> // For 3-parameter distance extension
+
 // Names from stl_iterator.h
 using std::input_iterator_tag;
 using std::output_iterator_tag;
@@ -112,7 +114,8 @@ template<class _Iter>
   value_type(const _Iter& __i)
   { return static_cast<typename iterator_traits<_Iter>::value_type*>(0); }
 
-using std::distance; 
+using std::distance;
+using __gnu_cxx::distance; // 3-parameter extension
 using std::advance; 
 
 using std::insert_iterator;
diff --git a/libstdc++-v3/include/ext/algorithm b/libstdc++-v3/include/ext/algorithm
index 929351eda5f..3d9ccd63d0a 100644
--- a/libstdc++-v3/include/ext/algorithm
+++ b/libstdc++-v3/include/ext/algorithm
@@ -56,6 +56,7 @@
 #ifndef _EXT_ALGORITHM
 #define _EXT_ALGORITHM
 
+#pragma GCC system_header
 #include <bits/std_algorithm.h>
 
 namespace __gnu_cxx
-- 
2.11.4.GIT