summaryrefslogtreecommitdiff
path: root/Rx
diff options
context:
space:
mode:
authorMatt <MattPD@users.noreply.github.com>2015-07-23 15:41:21 +0200
committerMatt <MattPD@users.noreply.github.com>2015-07-23 15:41:21 +0200
commit37976da75a1e5aa4a224f10c5e640f5294762f36 (patch)
tree88faf6bb252a57ea76718456b80bf3ad5406d6de /Rx
parentcc2c3511878964fe0287b2c88be5fce53a83efc5 (diff)
downloadRxCpp-37976da75a1e5aa4a224f10c5e640f5294762f36.tar.gz
Update rx-observable.hpp
Diffstat (limited to 'Rx')
-rw-r--r--Rx/v2/src/rxcpp/rx-observable.hpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/Rx/v2/src/rxcpp/rx-observable.hpp b/Rx/v2/src/rxcpp/rx-observable.hpp
index b0e4a5a..5950a42 100644
--- a/Rx/v2/src/rxcpp/rx-observable.hpp
+++ b/Rx/v2/src/rxcpp/rx-observable.hpp
@@ -2925,7 +2925,7 @@ public:
\snippet output.txt range sample
*/
template<class T>
- static auto range(T first = 0, T last = std::numeric_limits<T>::max(), ptrdiff_t step = 1)
+ static auto range(T first = 0, T last = std::numeric_limits<T>::max(), std::ptrdiff_t step = 1)
-> decltype(rxs::range<T>(first, last, step, identity_current_thread())) {
return rxs::range<T>(first, last, step, identity_current_thread());
}
@@ -2952,13 +2952,13 @@ public:
\snippet output.txt subscribe_on range sample
*/
template<class T, class Coordination>
- static auto range(T first, T last, ptrdiff_t step, Coordination cn)
+ static auto range(T first, T last, std::ptrdiff_t step, Coordination cn)
-> decltype(rxs::range<T>(first, last, step, std::move(cn))) {
return rxs::range<T>(first, last, step, std::move(cn));
}
/// Returns an observable that sends values in the range ```first```-```last``` by adding 1 to the previous value. The values are sent on the specified scheduler.
///
- /// \see rxcpp::observable<void,void>#range(T first, T last, ptrdiff_t step, Coordination cn)
+ /// \see rxcpp::observable<void,void>#range(T first, T last, std::ptrdiff_t step, Coordination cn)
template<class T, class Coordination>
static auto range(T first, T last, Coordination cn)
-> decltype(rxs::range<T>(first, last, std::move(cn))) {
@@ -2966,7 +2966,7 @@ public:
}
/// Returns an observable that infinitely (until overflow) sends values starting from ```first```. The values are sent on the specified scheduler.
///
- /// \see rxcpp::observable<void,void>#range(T first, T last, ptrdiff_t step, Coordination cn)
+ /// \see rxcpp::observable<void,void>#range(T first, T last, std::ptrdiff_t step, Coordination cn)
template<class T, class Coordination>
static auto range(T first, Coordination cn)
-> decltype(rxs::range<T>(first, std::move(cn))) {