diff options
5 files changed, 10 insertions, 2 deletions
diff --git a/connectivity/source/commontools/RowFunctionParser.cxx b/connectivity/source/commontools/RowFunctionParser.cxx index 541df8e6b2cc..15221ed0e260 100644 --- a/connectivity/source/commontools/RowFunctionParser.cxx +++ b/connectivity/source/commontools/RowFunctionParser.cxx @@ -40,7 +40,7 @@ #include <typeinfo> #define BOOST_SPIRIT_DEBUG #endif -#include <boost/spirit/core.hpp> +#include <boost/spirit/include/classic_core.hpp> #include "RowFunctionParser.hxx" #include <rtl/ustring.hxx> #include <tools/fract.hxx> diff --git a/connectivity/source/commontools/makefile.mk b/connectivity/source/commontools/makefile.mk index ee335705e651..cb5a4ad3f7aa 100644 --- a/connectivity/source/commontools/makefile.mk +++ b/connectivity/source/commontools/makefile.mk @@ -49,6 +49,8 @@ ENVCFLAGS+=/FR$(SLO)$/ NOOPTFILES= $(SLO)$/RowFunctionParser.obj .ENDIF +ENVCFLAGS += -DBOOST_SPIRIT_USE_OLD_NAMESPACE + # --- Files -------------------------------------------------------- EXCEPTIONSFILES=\ $(SLO)$/predicateinput.obj \ diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx index 839c34513c62..1eeb59befc1f 100644 --- a/connectivity/source/drivers/ado/APreparedStatement.cxx +++ b/connectivity/source/drivers/ado/APreparedStatement.cxx @@ -49,6 +49,10 @@ if(!x) \ ADOS::ThrowException(*m_pConnection->getConnection(),*this); +#ifdef max +# undef max +#endif + //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ using namespace connectivity::ado; diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx index 8f447de5b51c..022b7505cb44 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx @@ -44,7 +44,7 @@ #include <typeinfo> #define BOOST_SPIRIT_DEBUG #endif -#include <boost/spirit/core.hpp> +#include <boost/spirit/include/classic_core.hpp> #if (OSL_DEBUG_LEVEL > 0) #include <iostream> diff --git a/svx/source/customshapes/makefile.mk b/svx/source/customshapes/makefile.mk index 9940a9bb21bc..edd6f7d33ed0 100644 --- a/svx/source/customshapes/makefile.mk +++ b/svx/source/customshapes/makefile.mk @@ -49,6 +49,8 @@ ENABLE_EXCEPTIONS=TRUE NOOPTFILES= $(SLO)$/EnhancedCustomShapeFunctionParser.obj .ENDIF +ENVCFLAGS += -DBOOST_SPIRIT_USE_OLD_NAMESPACE + # --- Files ------------------------------------- LIB1TARGET= $(SLB)$/$(TARGET)-core.lib |