diff options
| author | Herbert Dürr <hdu@apache.org> | 2013-04-16 11:41:34 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-27 12:58:21 +0100 |
| commit | 982462ac5c6df0c85ba6a0b3fbdaa80b38a94882 (patch) | |
| tree | 8e1aff93f990d1ebf431e99e9c29a8f52112ff80 /slideshow/source/engine/activities | |
| parent | d133d8f0dfaaab53af225d3f667b14ee02aa21fc (diff) | |
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 6a88a21257124d953637c4b8ead9c9771e15b899)
Change-Id: I694bbad82b1a05ebe86c5c941f3ac85c71f5fc9e
Diffstat (limited to 'slideshow/source/engine/activities')
| -rw-r--r-- | slideshow/source/engine/activities/activitiesfactory.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/slideshow/source/engine/activities/activitiesfactory.cxx b/slideshow/source/engine/activities/activitiesfactory.cxx index 2354e51d9b0a..530a8fef224a 100644 --- a/slideshow/source/engine/activities/activitiesfactory.cxx +++ b/slideshow/source/engine/activities/activitiesfactory.cxx @@ -557,7 +557,7 @@ public: // interpolate between nIndex and nIndex+1 values (*mpAnim)( getPresentationValue( - accumulate( maValues.back(), + accumulate<ValueType>( maValues.back(), mbCumulative ? nRepeatCount : 0, maInterpolator( maValues[ nIndex ], maValues[ nIndex+1 ], @@ -577,7 +577,7 @@ public: // this is discrete, thus no lerp here. (*mpAnim)( getPresentationValue( - accumulate( maValues.back(), + accumulate<ValueType>( maValues.back(), mbCumulative ? nRepeatCount : 0, maValues[ nFrame ] ) ) ); } |