slideshow/source/engine/activities/activitiesfactory.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a470d97f2ddcb3607ae9d1df871a59f04d823564
Author: Collabora <l.lu...@collabora.com>
AuthorDate: Thu Jul 15 12:32:39 2021 +0200
Commit: Luboš Luňák <l.lu...@collabora.com>
CommitDate: Fri Jul 23 10:31:51 2021 +0200
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.lu...@collabora.com>
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 ] ) ) );
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
