diff options
| author | Collabora <l.lunak@collabora.com> | 2021-07-15 12:32:39 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2021-07-23 10:31:51 +0200 |
| commit | a470d97f2ddcb3607ae9d1df871a59f04d823564 (patch) | |
| tree | 23ce5b540a91ce2b58244d4e3b25836ae86325e0 | |
| parent | 6192fca42aec2db25f6dade632fd0e50eded5d0e (diff) | |
workaround accumulate() ambiguity on Mac with PCH
The PCH brings in <numeric>, which has std::accumulate(), which also
gets considered for whatever reason.
Change-Id: I69f375c871034e156598c8886822279f78c7f73f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119010
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
| -rw-r--r-- | slideshow/source/engine/activities/activitiesfactory.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/slideshow/source/engine/activities/activitiesfactory.cxx b/slideshow/source/engine/activities/activitiesfactory.cxx index 4732197657ba..2dadfea49e1c 100644 --- a/slideshow/source/engine/activities/activitiesfactory.cxx +++ b/slideshow/source/engine/activities/activitiesfactory.cxx @@ -573,7 +573,7 @@ public: // this is discrete, thus no lerp here. (*mpAnim)( getPresentationValue( - accumulate<ValueType>( maValues.back(), + slideshow::internal::accumulate<ValueType>( maValues.back(), mbCumulative ? nRepeatCount : 0, maValues[ nFrame ] ) ) ); } |