summaryrefslogtreecommitdiff
path: root/Rx/v2/src/rxcpp/sources/rx-iterate.hpp
diff options
context:
space:
mode:
authorKirk Shoop <kirk.shoop@microsoft.com>2014-07-15 22:02:19 -0700
committerKirk Shoop <kirk.shoop@microsoft.com>2014-07-15 22:02:19 -0700
commit638ec22f5a6073f15829b542577afc79e163d7cf (patch)
treeaf170d51b6c0b6d0770f6789f2758414fc5c920e /Rx/v2/src/rxcpp/sources/rx-iterate.hpp
parent71044820972aef3cef3295d1cdbf6faa2a74d872 (diff)
downloadRxCpp-638ec22f5a6073f15829b542577afc79e163d7cf.tar.gz
fixes some compilation issues adds a start_with ish thang
Diffstat (limited to 'Rx/v2/src/rxcpp/sources/rx-iterate.hpp')
-rw-r--r--Rx/v2/src/rxcpp/sources/rx-iterate.hpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Rx/v2/src/rxcpp/sources/rx-iterate.hpp b/Rx/v2/src/rxcpp/sources/rx-iterate.hpp
index 23107da..4c1fbef 100644
--- a/Rx/v2/src/rxcpp/sources/rx-iterate.hpp
+++ b/Rx/v2/src/rxcpp/sources/rx-iterate.hpp
@@ -159,14 +159,14 @@ auto from(Coordination cn)
template<class Value0, class... ValueN>
auto from(Value0 v0, ValueN... vn)
-> typename std::enable_if<!is_coordination<Value0>::value,
- decltype(iterate(std::array<Value0, sizeof...(ValueN) + 1>(), identity_immediate()))>::type {
+ decltype(iterate(std::array<Value0, sizeof...(ValueN) + 1>{v0, vn...}, identity_immediate()))>::type {
std::array<Value0, sizeof...(ValueN) + 1> c = {v0, vn...};
return iterate(std::move(c), identity_immediate());
}
template<class Coordination, class Value0, class... ValueN>
auto from(Coordination cn, Value0 v0, ValueN... vn)
-> typename std::enable_if<is_coordination<Coordination>::value,
- decltype(iterate(std::array<Value0, sizeof...(ValueN) + 1>(), std::move(cn)))>::type {
+ decltype(iterate(std::array<Value0, sizeof...(ValueN) + 1>{v0, vn...}, std::move(cn)))>::type {
std::array<Value0, sizeof...(ValueN) + 1> c = {v0, vn...};
return iterate(std::move(c), std::move(cn));
}