From 4ead2d9be8f6b9133a058b6e68719058694fb8ed Mon Sep 17 00:00:00 2001 From: Matt Date: Thu, 23 Jul 2015 15:39:47 +0200 Subject: Update testbench.cpp --- Ix/CPP/unittest/testbench.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'Ix') diff --git a/Ix/CPP/unittest/testbench.cpp b/Ix/CPP/unittest/testbench.cpp index 7788e5f..2103e22 100644 --- a/Ix/CPP/unittest/testbench.cpp +++ b/Ix/CPP/unittest/testbench.cpp @@ -10,6 +10,7 @@ #include #include +#include #include #include @@ -23,7 +24,7 @@ using namespace std; using namespace cpplinq; struct int_iter - : std::iterator + : std::iterator { int_iter(value_type i = 0, value_type step = 1) : value(i), step(step) {} @@ -37,14 +38,14 @@ struct int_iter int_iter& operator--() { value-=step; return *this; } - int_iter& operator+=(ptrdiff_t offset) { + int_iter& operator+=(std::ptrdiff_t offset) { value += step*offset; return *this; } - int_iter& operator-=(ptrdiff_t offset) { + int_iter& operator-=(std::ptrdiff_t offset) { value -= step*offset; return *this; } - ptrdiff_t operator-(int_iter rhs) const { - return ptrdiff_t((value - rhs.value)/step); + std::ptrdiff_t operator-(int_iter rhs) const { + return std::ptrdiff_t((value - rhs.value)/step); } bool operator==(int_iter other) const { return value == other.value; @@ -60,13 +61,13 @@ struct int_iter value_type value; value_type step; }; -int_iter operator+(int_iter lhs, ptrdiff_t rhs) { +int_iter operator+(int_iter lhs, std::ptrdiff_t rhs) { return lhs+=rhs; } -int_iter operator+(ptrdiff_t lhs, int_iter rhs) { +int_iter operator+(std::ptrdiff_t lhs, int_iter rhs) { return rhs+=lhs; } -int_iter operator-(int_iter lhs, ptrdiff_t rhs) { +int_iter operator-(int_iter lhs, std::ptrdiff_t rhs) { return lhs-=rhs; } struct int_range -- cgit v1.2.3