Author: hdu
Date: Fri Jan 4 15:24:51 2013
New Revision: 1428926
URL: http://svn.apache.org/viewvc?rev=1428926&view=rev
Log:
#i121561# workaround windows build problem with the new boost functions
Stlport 5.2 and newer set the _STLP_HAS_NATIVE_FLOAT_ABS define for all
MSVC>=2005,
so that the stl::abs() defines are enabled. Otherwise the compilation fails
because
only stl::abs(complex<>) gets included which messes things up because it is the
only one available after the SFINAE eliminations when the compiler tries to
instantiate e.g. boost's atanh using stl::abs()
Modified:
openoffice/trunk/main/sc/source/core/tool/interpr1.cxx
openoffice/trunk/main/sc/source/core/tool/interpr3.cxx
Modified: openoffice/trunk/main/sc/source/core/tool/interpr1.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/core/tool/interpr1.cxx?rev=1428926&r1=1428925&r2=1428926&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/core/tool/interpr1.cxx (original)
+++ openoffice/trunk/main/sc/source/core/tool/interpr1.cxx Fri Jan 4 15:24:51
2013
@@ -72,6 +72,9 @@
#include "doubleref.hxx"
#include "queryparam.hxx"
+#ifdef WNT /* #i121561# workaround build problem with stlport<5.2 and new
boost on Windows */
+#define _STLP_HAS_NATIVE_FLOAT_ABS
+#endif
#include <boost/math/special_functions/acosh.hpp>
#include <boost/math/special_functions/asinh.hpp>
#include <boost/math/special_functions/atanh.hpp>
Modified: openoffice/trunk/main/sc/source/core/tool/interpr3.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/core/tool/interpr3.cxx?rev=1428926&r1=1428925&r2=1428926&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/core/tool/interpr3.cxx (original)
+++ openoffice/trunk/main/sc/source/core/tool/interpr3.cxx Fri Jan 4 15:24:51
2013
@@ -44,6 +44,9 @@
#include <vector>
#include <algorithm>
+#ifdef WNT /* #i121561# workaround build problem with stlport<5.2 and new
boost on Windows */
+#define _STLP_HAS_NATIVE_FLOAT_ABS
+#endif
#include <boost/math/special_functions/atanh.hpp>
#include <boost/math/special_functions/expm1.hpp>
#include <boost/math/special_functions/log1p.hpp>
