forked from OSchip/llvm-project
...and then there was one. Only one copy of 'iterators.h' in the test tree for libc++
llvm-svn: 171479
This commit is contained in:
Marshall Clow
parent
2060482ece
commit
f8c2b82337
|
|
@ -16,7 +16,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
template <class InIter, class OutIter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
template <class InIter, class OutIter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
struct Pred
|
||||
{
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
template <class InIter, class OutIter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
template <class Iter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
template <class Iter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
struct gen_test
|
||||
{
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
struct gen_test
|
||||
{
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
#include <memory>
|
||||
#endif
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
template <class InIter, class OutIter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
#include <memory>
|
||||
#endif
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
template <class InIter, class OutIter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
struct is_odd
|
||||
{
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
#include <memory>
|
||||
#endif
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
struct is_odd
|
||||
{
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
struct is_odd
|
||||
{
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
struct is_odd
|
||||
{
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
#include <memory>
|
||||
#endif
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
struct is_odd
|
||||
{
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
#include <memory>
|
||||
#endif
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
template <class Iter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
template <class InIter, class OutIter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
#include <functional>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
template <class InIter, class OutIter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
#include <memory>
|
||||
#endif
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
template <class Iter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
template <class Iter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
template <class InIter, class OutIter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
#include <functional>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
template <class InIter, class OutIter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
#include <functional>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
template <class Iter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
template <class Iter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
template <class InIter, class OutIter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
#include <memory>
|
||||
#endif
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
template <class Iter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
template <class InIter, class OutIter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
#include <memory>
|
||||
#endif
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
template<class Iter1, class Iter2>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
#include <functional>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
template<class InIter1, class InIter2, class OutIter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
#include <functional>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
template <class InIter, class OutIter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
#include <memory>
|
||||
#endif
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
template <class Iter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
template <class InIter, class OutIter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
struct count_equal
|
||||
{
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
#include <memory>
|
||||
#endif
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
struct count_equal
|
||||
{
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
int main()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
#include <functional>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
int main()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
struct test1
|
||||
{
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
struct test1
|
||||
{
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
int main()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
#include <functional>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
int main()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
int main()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
#include <functional>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
int main()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
template <class Iter1, class Iter2>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
struct count_equal
|
||||
{
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
int main()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
#include <functional>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
int main()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
int main()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
#include <functional>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
int main()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
#include <functional>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
int main()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
struct for_each_test
|
||||
{
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
int main()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
#include <functional>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
int main()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
struct test1
|
||||
{
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
template <class Iter1, class Iter2>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
struct count_equal
|
||||
{
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
int main()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
#include <functional>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
int main()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
#include <vector>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../../iterators.h"
|
||||
#include "../../../../iterators.h"
|
||||
|
||||
template <class Iter, class T>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
#include <functional>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../../iterators.h"
|
||||
#include "../../../../iterators.h"
|
||||
|
||||
template <class Iter, class T>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
#include <vector>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../../iterators.h"
|
||||
#include "../../../../iterators.h"
|
||||
|
||||
template <class Iter, class T>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
#include <vector>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../../iterators.h"
|
||||
#include "../../../../iterators.h"
|
||||
|
||||
template <class Iter, class T>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
#include <vector>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../../iterators.h"
|
||||
#include "../../../../iterators.h"
|
||||
|
||||
template <class Iter, class T>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
#include <vector>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../../iterators.h"
|
||||
#include "../../../../iterators.h"
|
||||
|
||||
template <class Iter, class T>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
#include <vector>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../../iterators.h"
|
||||
#include "../../../../iterators.h"
|
||||
|
||||
template <class Iter, class T>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
#include <vector>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../../iterators.h"
|
||||
#include "../../../../iterators.h"
|
||||
|
||||
template <class Iter, class T>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
template <class Iter1, class Iter2>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
#include <functional>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
template <class Iter1, class Iter2>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
template <class Iter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ struct indirect_less
|
|||
|
||||
#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
template <class Iter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
template <class InIter1, class InIter2, class OutIter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
#include <functional>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
template <class InIter1, class InIter2, class OutIter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
template <class Iter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
#include <functional>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
template <class Iter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
template <class Iter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
#include <functional>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
template <class Iter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
template <class Iter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
#include <functional>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
template <class Iter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
#include <cstdio>
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
#include <functional>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
#include <cstdio>
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
#include <cstdio>
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
#include <functional>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../iterators.h"
|
||||
#include "../../../iterators.h"
|
||||
|
||||
#include <cstdio>
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../../iterators.h"
|
||||
#include "../../../../iterators.h"
|
||||
|
||||
template <class Iter1, class Iter2>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
#include <functional>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../../iterators.h"
|
||||
#include "../../../../iterators.h"
|
||||
|
||||
template <class Iter1, class Iter2>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../../iterators.h"
|
||||
#include "../../../../iterators.h"
|
||||
|
||||
template <class Iter1, class Iter2, class OutIter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
#include <functional>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../../iterators.h"
|
||||
#include "../../../../iterators.h"
|
||||
|
||||
template <class Iter1, class Iter2, class OutIter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../../iterators.h"
|
||||
#include "../../../../iterators.h"
|
||||
|
||||
template <class Iter1, class Iter2, class OutIter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
#include <functional>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../../iterators.h"
|
||||
#include "../../../../iterators.h"
|
||||
|
||||
template <class Iter1, class Iter2, class OutIter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../../iterators.h"
|
||||
#include "../../../../iterators.h"
|
||||
|
||||
template <class Iter1, class Iter2, class OutIter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
#include <functional>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../../iterators.h"
|
||||
#include "../../../../iterators.h"
|
||||
|
||||
template <class Iter1, class Iter2, class OutIter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../../iterators.h"
|
||||
#include "../../../../iterators.h"
|
||||
|
||||
template <class Iter1, class Iter2, class OutIter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
#include <functional>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../../iterators.h"
|
||||
#include "../../../../iterators.h"
|
||||
|
||||
template <class Iter1, class Iter2, class OutIter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../../iterators.h"
|
||||
#include "../../../../iterators.h"
|
||||
|
||||
template <class Iter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
#include <functional>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../../iterators.h"
|
||||
#include "../../../../iterators.h"
|
||||
|
||||
template <class Iter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../../iterators.h"
|
||||
#include "../../../../iterators.h"
|
||||
|
||||
template <class Iter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
#include <functional>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../../iterators.h"
|
||||
#include "../../../../iterators.h"
|
||||
|
||||
template <class Iter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
#include <algorithm>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../../iterators.h"
|
||||
#include "../../../../iterators.h"
|
||||
|
||||
template <class Iter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
#include <functional>
|
||||
#include <cassert>
|
||||
|
||||
#include "../../../iterators.h"
|
||||
#include "../../../../iterators.h"
|
||||
|
||||
template <class Iter>
|
||||
void
|
||||
|
|
|
|||
|
|
@ -1,314 +0,0 @@
|
|||
#ifndef ITERATORS_H
|
||||
#define ITERATORS_H
|
||||
|
||||
#include <iterator>
|
||||
|
||||
template <class It>
|
||||
class output_iterator
|
||||
{
|
||||
It it_;
|
||||
|
||||
template <class U> friend class output_iterator;
|
||||
public:
|
||||
typedef std::output_iterator_tag iterator_category;
|
||||
typedef typename std::iterator_traits<It>::value_type value_type;
|
||||
typedef typename std::iterator_traits<It>::difference_type difference_type;
|
||||
typedef It pointer;
|
||||
typedef typename std::iterator_traits<It>::reference reference;
|
||||
|
||||
It base() const {return it_;}
|
||||
|
||||
explicit output_iterator(It it) : it_(it) {}
|
||||
template <class U>
|
||||
output_iterator(const output_iterator<U>& u) :it_(u.it_) {}
|
||||
|
||||
reference operator*() const {return *it_;}
|
||||
|
||||
output_iterator& operator++() {++it_; return *this;}
|
||||
output_iterator operator++(int)
|
||||
{output_iterator tmp(*this); ++(*this); return tmp;}
|
||||
};
|
||||
|
||||
template <class Iter>
|
||||
inline
|
||||
Iter
|
||||
base(output_iterator<Iter> i)
|
||||
{
|
||||
return i.base();
|
||||
}
|
||||
|
||||
template <class It>
|
||||
class input_iterator
|
||||
{
|
||||
It it_;
|
||||
|
||||
template <class U> friend class input_iterator;
|
||||
public:
|
||||
typedef std::input_iterator_tag iterator_category;
|
||||
typedef typename std::iterator_traits<It>::value_type value_type;
|
||||
typedef typename std::iterator_traits<It>::difference_type difference_type;
|
||||
typedef It pointer;
|
||||
typedef typename std::iterator_traits<It>::reference reference;
|
||||
|
||||
It base() const {return it_;}
|
||||
|
||||
explicit input_iterator(It it) : it_(it) {}
|
||||
template <class U>
|
||||
input_iterator(const input_iterator<U>& u) :it_(u.it_) {}
|
||||
|
||||
reference operator*() const {return *it_;}
|
||||
pointer operator->() const {return it_;}
|
||||
|
||||
input_iterator& operator++() {++it_; return *this;}
|
||||
input_iterator operator++(int)
|
||||
{input_iterator tmp(*this); ++(*this); return tmp;}
|
||||
};
|
||||
|
||||
template <class T, class U>
|
||||
inline
|
||||
bool
|
||||
operator==(const input_iterator<T>& x, const input_iterator<U>& y)
|
||||
{
|
||||
return x.base() == y.base();
|
||||
}
|
||||
|
||||
template <class T, class U>
|
||||
inline
|
||||
bool
|
||||
operator!=(const input_iterator<T>& x, const input_iterator<U>& y)
|
||||
{
|
||||
return !(x == y);
|
||||
}
|
||||
|
||||
template <class Iter>
|
||||
inline
|
||||
Iter
|
||||
base(input_iterator<Iter> i)
|
||||
{
|
||||
return i.base();
|
||||
}
|
||||
|
||||
template <class It>
|
||||
class forward_iterator
|
||||
{
|
||||
It it_;
|
||||
|
||||
template <class U> friend class forward_iterator;
|
||||
public:
|
||||
typedef std::forward_iterator_tag iterator_category;
|
||||
typedef typename std::iterator_traits<It>::value_type value_type;
|
||||
typedef typename std::iterator_traits<It>::difference_type difference_type;
|
||||
typedef It pointer;
|
||||
typedef typename std::iterator_traits<It>::reference reference;
|
||||
|
||||
It base() const {return it_;}
|
||||
|
||||
forward_iterator() : it_() {}
|
||||
explicit forward_iterator(It it) : it_(it) {}
|
||||
template <class U>
|
||||
forward_iterator(const forward_iterator<U>& u) :it_(u.it_) {}
|
||||
|
||||
reference operator*() const {return *it_;}
|
||||
pointer operator->() const {return it_;}
|
||||
|
||||
forward_iterator& operator++() {++it_; return *this;}
|
||||
forward_iterator operator++(int)
|
||||
{forward_iterator tmp(*this); ++(*this); return tmp;}
|
||||
};
|
||||
|
||||
template <class T, class U>
|
||||
inline
|
||||
bool
|
||||
operator==(const forward_iterator<T>& x, const forward_iterator<U>& y)
|
||||
{
|
||||
return x.base() == y.base();
|
||||
}
|
||||
|
||||
template <class T, class U>
|
||||
inline
|
||||
bool
|
||||
operator!=(const forward_iterator<T>& x, const forward_iterator<U>& y)
|
||||
{
|
||||
return !(x == y);
|
||||
}
|
||||
|
||||
template <class Iter>
|
||||
inline
|
||||
Iter
|
||||
base(forward_iterator<Iter> i)
|
||||
{
|
||||
return i.base();
|
||||
}
|
||||
|
||||
template <class It>
|
||||
class bidirectional_iterator
|
||||
{
|
||||
It it_;
|
||||
|
||||
template <class U> friend class bidirectional_iterator;
|
||||
public:
|
||||
typedef std::bidirectional_iterator_tag iterator_category;
|
||||
typedef typename std::iterator_traits<It>::value_type value_type;
|
||||
typedef typename std::iterator_traits<It>::difference_type difference_type;
|
||||
typedef It pointer;
|
||||
typedef typename std::iterator_traits<It>::reference reference;
|
||||
|
||||
It base() const {return it_;}
|
||||
|
||||
bidirectional_iterator() : it_() {}
|
||||
explicit bidirectional_iterator(It it) : it_(it) {}
|
||||
template <class U>
|
||||
bidirectional_iterator(const bidirectional_iterator<U>& u) :it_(u.it_) {}
|
||||
|
||||
reference operator*() const {return *it_;}
|
||||
pointer operator->() const {return it_;}
|
||||
|
||||
bidirectional_iterator& operator++() {++it_; return *this;}
|
||||
bidirectional_iterator operator++(int)
|
||||
{bidirectional_iterator tmp(*this); ++(*this); return tmp;}
|
||||
|
||||
bidirectional_iterator& operator--() {--it_; return *this;}
|
||||
bidirectional_iterator operator--(int)
|
||||
{bidirectional_iterator tmp(*this); --(*this); return tmp;}
|
||||
};
|
||||
|
||||
template <class T, class U>
|
||||
inline
|
||||
bool
|
||||
operator==(const bidirectional_iterator<T>& x, const bidirectional_iterator<U>& y)
|
||||
{
|
||||
return x.base() == y.base();
|
||||
}
|
||||
|
||||
template <class T, class U>
|
||||
inline
|
||||
bool
|
||||
operator!=(const bidirectional_iterator<T>& x, const bidirectional_iterator<U>& y)
|
||||
{
|
||||
return !(x == y);
|
||||
}
|
||||
|
||||
template <class Iter>
|
||||
inline
|
||||
Iter
|
||||
base(bidirectional_iterator<Iter> i)
|
||||
{
|
||||
return i.base();
|
||||
}
|
||||
|
||||
template <class It>
|
||||
class random_access_iterator
|
||||
{
|
||||
It it_;
|
||||
|
||||
template <class U> friend class random_access_iterator;
|
||||
public:
|
||||
typedef std::random_access_iterator_tag iterator_category;
|
||||
typedef typename std::iterator_traits<It>::value_type value_type;
|
||||
typedef typename std::iterator_traits<It>::difference_type difference_type;
|
||||
typedef It pointer;
|
||||
typedef typename std::iterator_traits<It>::reference reference;
|
||||
|
||||
It base() const {return it_;}
|
||||
|
||||
random_access_iterator() : it_() {}
|
||||
explicit random_access_iterator(It it) : it_(it) {}
|
||||
template <class U>
|
||||
random_access_iterator(const random_access_iterator<U>& u) :it_(u.it_) {}
|
||||
|
||||
reference operator*() const {return *it_;}
|
||||
pointer operator->() const {return it_;}
|
||||
|
||||
random_access_iterator& operator++() {++it_; return *this;}
|
||||
random_access_iterator operator++(int)
|
||||
{random_access_iterator tmp(*this); ++(*this); return tmp;}
|
||||
|
||||
random_access_iterator& operator--() {--it_; return *this;}
|
||||
random_access_iterator operator--(int)
|
||||
{random_access_iterator tmp(*this); --(*this); return tmp;}
|
||||
|
||||
random_access_iterator& operator+=(difference_type n) {it_ += n; return *this;}
|
||||
random_access_iterator operator+(difference_type n) const
|
||||
{random_access_iterator tmp(*this); tmp += n; return tmp;}
|
||||
friend random_access_iterator operator+(difference_type n, random_access_iterator x)
|
||||
{x += n; return x;}
|
||||
random_access_iterator& operator-=(difference_type n) {return *this += -n;}
|
||||
random_access_iterator operator-(difference_type n) const
|
||||
{random_access_iterator tmp(*this); tmp -= n; return tmp;}
|
||||
|
||||
reference operator[](difference_type n) const {return it_[n];}
|
||||
};
|
||||
|
||||
template <class T, class U>
|
||||
inline
|
||||
bool
|
||||
operator==(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
|
||||
{
|
||||
return x.base() == y.base();
|
||||
}
|
||||
|
||||
template <class T, class U>
|
||||
inline
|
||||
bool
|
||||
operator!=(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
|
||||
{
|
||||
return !(x == y);
|
||||
}
|
||||
|
||||
template <class T, class U>
|
||||
inline
|
||||
bool
|
||||
operator<(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
|
||||
{
|
||||
return x.base() < y.base();
|
||||
}
|
||||
|
||||
template <class T, class U>
|
||||
inline
|
||||
bool
|
||||
operator<=(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
|
||||
{
|
||||
return !(y < x);
|
||||
}
|
||||
|
||||
template <class T, class U>
|
||||
inline
|
||||
bool
|
||||
operator>(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
|
||||
{
|
||||
return y < x;
|
||||
}
|
||||
|
||||
template <class T, class U>
|
||||
inline
|
||||
bool
|
||||
operator>=(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
|
||||
{
|
||||
return !(x < y);
|
||||
}
|
||||
|
||||
template <class T, class U>
|
||||
inline
|
||||
typename std::iterator_traits<T>::difference_type
|
||||
operator-(const random_access_iterator<T>& x, const random_access_iterator<U>& y)
|
||||
{
|
||||
return x.base() - y.base();
|
||||
}
|
||||
|
||||
template <class Iter>
|
||||
inline
|
||||
Iter
|
||||
base(random_access_iterator<Iter> i)
|
||||
{
|
||||
return i.base();
|
||||
}
|
||||
|
||||
template <class Iter>
|
||||
inline
|
||||
Iter
|
||||
base(Iter i)
|
||||
{
|
||||
return i;
|
||||
}
|
||||
|
||||
#endif // ITERATORS_H
|
||||
|
|
@ -275,4 +275,22 @@ operator-(const random_access_iterator<T>& x, const random_access_iterator<U>& y
|
|||
return x.base() - y.base();
|
||||
}
|
||||
|
||||
template <class Iter>
|
||||
inline Iter base(output_iterator<Iter> i) { return i.base(); }
|
||||
|
||||
template <class Iter>
|
||||
inline Iter base(input_iterator<Iter> i) { return i.base(); }
|
||||
|
||||
template <class Iter>
|
||||
inline Iter base(forward_iterator<Iter> i) { return i.base(); }
|
||||
|
||||
template <class Iter>
|
||||
inline Iter base(bidirectional_iterator<Iter> i) { return i.base(); }
|
||||
|
||||
template <class Iter>
|
||||
inline Iter base(random_access_iterator<Iter> i) { return i.base(); }
|
||||
|
||||
template <class Iter> // everything else
|
||||
inline Iter base(Iter i) { return i; }
|
||||
|
||||
#endif // ITERATORS_H
|
||||
|
|
|
|||
|
|
@ -29,16 +29,16 @@ test(U u)
|
|||
assert(r1.base() == u);
|
||||
}
|
||||
|
||||
struct base {};
|
||||
struct derived : base {};
|
||||
struct Base {};
|
||||
struct Derived : Base {};
|
||||
|
||||
int main()
|
||||
{
|
||||
derived d;
|
||||
Derived d;
|
||||
|
||||
test<input_iterator<base*> >(input_iterator<derived*>(&d));
|
||||
test<forward_iterator<base*> >(forward_iterator<derived*>(&d));
|
||||
test<bidirectional_iterator<base*> >(bidirectional_iterator<derived*>(&d));
|
||||
test<random_access_iterator<const base*> >(random_access_iterator<derived*>(&d));
|
||||
test<base*>(&d);
|
||||
test<input_iterator<Base*> >(input_iterator<Derived*>(&d));
|
||||
test<forward_iterator<Base*> >(forward_iterator<Derived*>(&d));
|
||||
test<bidirectional_iterator<Base*> >(bidirectional_iterator<Derived*>(&d));
|
||||
test<random_access_iterator<const Base*> >(random_access_iterator<Derived*>(&d));
|
||||
test<Base*>(&d);
|
||||
}
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue