sc/source/core/tool/calcconfig.cxx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
New commits: commit a8d80a7399e91b3ef27ab1838c81999cd180a35c Author: Tor Lillqvist <t...@collabora.com> Date: Thu Nov 6 13:00:08 2014 +0200 Don't be too modern for MSVC2012 Change-Id: I6f9049f6b5261f6099e97c7f10d6ab6ea7eaab9b diff --git a/sc/source/core/tool/calcconfig.cxx b/sc/source/core/tool/calcconfig.cxx index 46a2404..7cb995f 100644 --- a/sc/source/core/tool/calcconfig.cxx +++ b/sc/source/core/tool/calcconfig.cxx @@ -37,7 +37,11 @@ void ScCalcConfig::setOpenCLConfigToDefault() mbOpenCLSubsetOnly = true; mbOpenCLAutoSelect = true; mnOpenCLMinimumFormulaGroupSize = 20; - maOpenCLSubsetOpCodes = {ocMin, ocMax, ocSum, ocAverage, ocSumIfs}; + maOpenCLSubsetOpCodes.insert(ocMin); + maOpenCLSubsetOpCodes.insert(ocMax); + maOpenCLSubsetOpCodes.insert(ocSum); + maOpenCLSubsetOpCodes.insert(ocAverage); + maOpenCLSubsetOpCodes.insert(ocSumIfs); maOpenCLBlackList = { "Windows/*/Intel(R) Corporation/9.17.10.2884", "SuperOS/1.0/Big Corp, Inc./2.3\\/beta" _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits