summaryrefslogtreecommitdiff
path: root/Ix
diff options
context:
space:
mode:
authorMatt <MattPD@users.noreply.github.com>2015-07-23 15:39:47 +0200
committerMatt <MattPD@users.noreply.github.com>2015-07-23 15:39:47 +0200
commit4ead2d9be8f6b9133a058b6e68719058694fb8ed (patch)
tree7284ef2a4e8f0ca229e9f3751215fd61d1d5fb27 /Ix
parent48f2adf65a2d52d78b509dd97d31e38e0ac17a51 (diff)
downloadRxCpp-4ead2d9be8f6b9133a058b6e68719058694fb8ed.tar.gz
Update testbench.cpp
Diffstat (limited to 'Ix')
-rw-r--r--Ix/CPP/unittest/testbench.cpp17
1 files changed, 9 insertions, 8 deletions
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 <string>
#include <ctime>
+#include <cstddef>
#include <boost/lambda/core.hpp>
#include <boost/lambda/lambda.hpp>
@@ -23,7 +24,7 @@ using namespace std;
using namespace cpplinq;
struct int_iter
- : std::iterator<std::random_access_iterator_tag, int, ptrdiff_t, int*, int>
+ : std::iterator<std::random_access_iterator_tag, int, std::ptrdiff_t, int*, int>
{
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