Author: pfg
Date: Fri Jan  4 15:17:46 2013
New Revision: 1428922

URL: http://svn.apache.org/viewvc?rev=1428922&view=rev
Log:
i121561 - Better attempt to fix the Windows build.

Revert r1428523. Apparently the problem is caused by a template
conflict with STLPort.

Special thanks to hdu@ for his incredible detective work.

Modified:
    openoffice/trunk/main/sc/source/core/inc/interpre.hxx

Modified: openoffice/trunk/main/sc/source/core/inc/interpre.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/core/inc/interpre.hxx?rev=1428922&r1=1428921&r2=1428922&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/core/inc/interpre.hxx (original)
+++ openoffice/trunk/main/sc/source/core/inc/interpre.hxx Fri Jan  4 15:17:46 
2013
@@ -33,11 +33,16 @@
 #include <math.h>
 #include <map>
 
+// Policy definition for STLPORT
+// This works around some issues with Boost
+#ifdef WNT
+#define _STLP_HAS_NATIVE_FLOAT_ABS
+#endif
+
 // Policy Definitions for Boost math.
 // This header must be included before including any Boost
 // math function.
 //
-#define BOOST_MATH_ASSERT_UNDEFINED_POLICY false
 #define BOOST_MATH_OVERFLOW_ERROR_POLICY errno_on_error
 
 class ScDocument;


Reply via email to