diff options
author | Matt <MattPD@users.noreply.github.com> | 2015-07-23 15:54:18 +0200 |
---|---|---|
committer | Matt <MattPD@users.noreply.github.com> | 2015-07-23 15:54:18 +0200 |
commit | 9254be8b44b7cdfc92bcd070be6ae9c5d80a7a6c (patch) | |
tree | ab4cf5cbccd6fccf8fd0a72dc02d6a95bec0d733 /Rx | |
parent | 27eb193a8cc0af51812f9bc0a9e5683b6c3d2d53 (diff) | |
download | RxCpp-9254be8b44b7cdfc92bcd070be6ae9c5d80a7a6c.tar.gz |
Update rx-util.hpp
Diffstat (limited to 'Rx')
-rw-r--r-- | Rx/v2/src/rxcpp/rx-util.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Rx/v2/src/rxcpp/rx-util.hpp b/Rx/v2/src/rxcpp/rx-util.hpp index 5231da0..cd2b932 100644 --- a/Rx/v2/src/rxcpp/rx-util.hpp +++ b/Rx/v2/src/rxcpp/rx-util.hpp @@ -35,7 +35,7 @@ namespace util { template<class T> using value_type_t = typename T::value_type; template<class T> using decay_t = typename std::decay<T>::type; -template<class T, size_t size> +template<class T, std::size_t size> std::vector<T> to_vector(const T (&arr) [size]) { return std::vector<T>(std::begin(arr), std::end(arr)); } @@ -479,7 +479,7 @@ public: return !is_set; } - size_t size() const { + std::size_t size() const { return is_set ? 1 : 0; } |