X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=libstdc%2B%2B-v3%2Finclude%2Fbackward%2Falgo.h;h=6f248356cf8ec4843282ef8558d3aaff36d3314e;hp=3f53f0554b4b4a1462f5539f083a50fa15b05cf5;hb=dbccc45ae903778d235be632ea79ef85716e6a45;hpb=1d61409bdcfca022b5b0cb7b3fb97012753fdce9

diff --git a/libstdc++-v3/include/backward/algo.h b/libstdc++-v3/include/backward/algo.h
index 3f53f0554b4..6f248356cf8 100644
--- a/libstdc++-v3/include/backward/algo.h
+++ b/libstdc++-v3/include/backward/algo.h
@@ -53,8 +53,8 @@
  * purpose.  It is provided "as is" without express or implied warranty.
  */
 
-#ifndef _CPP_BACKWARD_ALGO_H
-#define _CPP_BACKWARD_ALGO_H 1
+#ifndef _BACKWARD_ALGO_H
+#define _BACKWARD_ALGO_H 1
 
 #include "backward_warning.h"
 #include "algobase.h"
@@ -62,63 +62,61 @@
 #include "iterator.h"
 #include <bits/stl_algo.h>
 #include <bits/stl_numeric.h>
+#include <ext/algorithm>
+#include <ext/numeric>
 
 // Names from <stl_algo.h>
-using std::for_each; 
-using std::find; 
-using std::find_if; 
-using std::adjacent_find; 
-using std::count; 
-using std::count_if; 
-using std::search; 
-using std::search_n; 
-using std::swap_ranges; 
-using std::transform; 
-using std::replace; 
-using std::replace_if; 
-using std::replace_copy; 
-using std::replace_copy_if; 
-using std::generate; 
-using std::generate_n; 
-using std::remove; 
-using std::remove_if; 
-using std::remove_copy; 
-using std::remove_copy_if; 
-using std::unique; 
-using std::unique_copy; 
-using std::reverse; 
-using std::reverse_copy; 
-using std::rotate; 
-using std::rotate_copy; 
-using std::random_shuffle; 
-using std::random_sample; 
-using std::random_sample_n; 
-using std::partition; 
-using std::stable_partition; 
-using std::sort; 
-using std::stable_sort; 
-using std::partial_sort; 
-using std::partial_sort_copy; 
-using std::nth_element; 
-using std::lower_bound; 
-using std::upper_bound; 
-using std::equal_range; 
-using std::binary_search; 
-using std::merge; 
-using std::inplace_merge; 
-using std::includes; 
-using std::set_union; 
-using std::set_intersection; 
-using std::set_difference; 
-using std::set_symmetric_difference; 
-using std::min_element; 
-using std::max_element; 
-using std::next_permutation; 
-using std::prev_permutation; 
-using std::find_first_of; 
-using std::find_end; 
-using std::is_sorted; 
-using std::is_heap; 
+using std::for_each;
+using std::find;
+using std::find_if;
+using std::adjacent_find;
+using std::count;
+using std::count_if;
+using std::search;
+using std::search_n;
+using std::swap_ranges;
+using std::transform;
+using std::replace;
+using std::replace_if;
+using std::replace_copy;
+using std::replace_copy_if;
+using std::generate;
+using std::generate_n;
+using std::remove;
+using std::remove_if;
+using std::remove_copy;
+using std::remove_copy_if;
+using std::unique;
+using std::unique_copy;
+using std::reverse;
+using std::reverse_copy;
+using std::rotate;
+using std::rotate_copy;
+using std::random_shuffle;
+using std::partition;
+using std::stable_partition;
+using std::sort;
+using std::stable_sort;
+using std::partial_sort;
+using std::partial_sort_copy;
+using std::nth_element;
+using std::lower_bound;
+using std::upper_bound;
+using std::equal_range;
+using std::binary_search;
+using std::merge;
+using std::inplace_merge;
+using std::includes;
+using std::set_union;
+using std::set_intersection;
+using std::set_difference;
+using std::set_symmetric_difference;
+using std::min_element;
+using std::max_element;
+using std::next_permutation;
+using std::prev_permutation;
+using std::find_first_of;
+using std::find_end;
 
 // Names from stl_heap.h
 using std::push_heap;
@@ -127,14 +125,24 @@ using std::make_heap;
 using std::sort_heap;
 
 // Names from stl_numeric.h
-using std::accumulate; 
-using std::inner_product; 
-using std::partial_sum; 
-using std::adjacent_difference; 
-using std::power; 
-using std::iota; 
+using std::accumulate;
+using std::inner_product;
+using std::partial_sum;
+using std::adjacent_difference;
 
-#endif /* _CPP_BACKWARD_ALGO_H */
+// Names from ext/algorithm
+using __gnu_cxx::random_sample;
+using __gnu_cxx::random_sample_n;
+using __gnu_cxx::is_sorted;
+using __gnu_cxx::is_heap;
+using __gnu_cxx::count;   // Extension returning void
+using __gnu_cxx::count_if;   // Extension returning void
+
+// Names from ext/numeric
+using __gnu_cxx::power;
+using __gnu_cxx::iota;
+
+#endif /* _BACKWARD_ALGO_H */
 
 // Local Variables:
 // mode:C++