Author: hdu
Date: Tue Apr 16 12:41:34 2013
New Revision: 1468397
URL: http://svn.apache.org/r1468397
Log:
eliminate type ambiguity for std::accumulate() invocation
else clang/libc++ cannot decide between bool and a reference into a bit-vector
specialization
Modified:
openoffice/trunk/main/slideshow/source/engine/activities/activitiesfactory.cxx
Modified:
openoffice/trunk/main/slideshow/source/engine/activities/activitiesfactory.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/slideshow/source/engine/activities/activitiesfactory.cxx?rev=1468397&r1=1468396&r2=1468397&view=diff
==============================================================================
---
openoffice/trunk/main/slideshow/source/engine/activities/activitiesfactory.cxx
(original)
+++
openoffice/trunk/main/slideshow/source/engine/activities/activitiesfactory.cxx
Tue Apr 16 12:41:34 2013
@@ -495,7 +495,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 ],
@@ -515,7 +515,7 @@ public:
// this is discrete, thus no lerp here.
(*mpAnim)(
getPresentationValue(
- accumulate( maValues.back(),
+ accumulate<ValueType>( maValues.back(),
mbCumulative ? nRepeatCount : 0,
maValues[ nFrame ] ) ) );
}
