Kaydet (Commit) 982462ac authored tarafından Herbert Dürr's avatar Herbert Dürr Kaydeden (comit) Caolán McNamara

eliminate type ambiguity for std::accumulate() invocation

else clang/libc++ cannot decide between bool and a reference into a bit-vector
specialization

(cherry picked from commit 6a88a212)

Change-Id: I694bbad82b1a05ebe86c5c941f3ac85c71f5fc9e
üst d133d8f0
...@@ -557,7 +557,7 @@ public: ...@@ -557,7 +557,7 @@ public:
// interpolate between nIndex and nIndex+1 values // interpolate between nIndex and nIndex+1 values
(*mpAnim)( (*mpAnim)(
getPresentationValue( getPresentationValue(
accumulate( maValues.back(), accumulate<ValueType>( maValues.back(),
mbCumulative ? nRepeatCount : 0, mbCumulative ? nRepeatCount : 0,
maInterpolator( maValues[ nIndex ], maInterpolator( maValues[ nIndex ],
maValues[ nIndex+1 ], maValues[ nIndex+1 ],
...@@ -577,7 +577,7 @@ public: ...@@ -577,7 +577,7 @@ public:
// this is discrete, thus no lerp here. // this is discrete, thus no lerp here.
(*mpAnim)( (*mpAnim)(
getPresentationValue( getPresentationValue(
accumulate( maValues.back(), accumulate<ValueType>( maValues.back(),
mbCumulative ? nRepeatCount : 0, mbCumulative ? nRepeatCount : 0,
maValues[ nFrame ] ) ) ); maValues[ nFrame ] ) ) );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment