diff --git a/filter_iterator.htm b/filter_iterator.htm index 65e7f27..bbd96e5 100644 --- a/filter_iterator.htm +++ b/filter_iterator.htm @@ -62,7 +62,6 @@ class filter_iterator_generator { public: typedef iterator_adaptor<...> type; // the resulting filter iterator type - typedef ... policies_type; // the policies type for the iterator adaptor } @@ -80,11 +79,12 @@ int main() { int numbers[] = { 0, -1, 4, -3, 5, 8, -2 }; const int N = sizeof(numbers)/sizeof(int); - typedef boost::filter_iterator_generator<is_positive_number, int*, int> Gen; + typedef boost::filter_iterator_generator<is_positive_number, int*, int> + FilterIter; is_positive_number predicate; - Gen::policies_type policies(predicate, numbers + N); - Gen::type filter_iter_first(numbers, policies); - Gen::type filter_iter_last(numbers + N, policies); + FilterIter::policies_type policies(predicate, numbers + N); + FilterIter filter_iter_first(numbers, policies); + FilterIter filter_iter_last(numbers + N, policies); std::copy(filter_iter_first, filter_iter_last, std::ostream_iterator<int>(std::cout, " ")); std::cout << std::endl; diff --git a/filter_iterator_example.cpp b/filter_iterator_example.cpp index ce96334..6ca0605 100644 --- a/filter_iterator_example.cpp +++ b/filter_iterator_example.cpp @@ -30,11 +30,12 @@ int main() std::cout << std::endl; // Example using filter_iterator_generator - typedef boost::filter_iterator_generator Gen; + typedef boost::filter_iterator_generator::type + FilterIter; is_positive_number predicate; - Gen::policies_type policies(predicate, numbers + N); - Gen::type filter_iter_first(numbers, policies); - Gen::type filter_iter_last(numbers + N, policies); + FilterIter::policies_type policies(predicate, numbers + N); + FilterIter filter_iter_first(numbers, policies); + FilterIter filter_iter_last(numbers + N, policies); std::copy(filter_iter_first, filter_iter_last, std::ostream_iterator(std::cout, " ")); std::cout << std::endl;