summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sdext/source/pdfimport/pdfparse/makefile.mk2
-rw-r--r--sdext/source/pdfimport/pdfparse/pdfparse.cxx12
2 files changed, 6 insertions, 8 deletions
diff --git a/sdext/source/pdfimport/pdfparse/makefile.mk b/sdext/source/pdfimport/pdfparse/makefile.mk
index 7249e52205eb..9cbb5f1b92fd 100644
--- a/sdext/source/pdfimport/pdfparse/makefile.mk
+++ b/sdext/source/pdfimport/pdfparse/makefile.mk
@@ -44,6 +44,8 @@ EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
CFLAGS+=-DSYSTEM_ZLIB
.ENDIF
+ENVCFLAGS += -DBOOST_SPIRIT_USE_OLD_NAMESPACE
+
# --- Files --------------------------------------------------------
SLOFILES=\
diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
index baaef9877270..c9b3b1522cc5 100644
--- a/sdext/source/pdfimport/pdfparse/pdfparse.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
@@ -42,14 +42,10 @@
// workaround windows compiler: do not include multi_pass.hpp
//#include <boost/spirit.hpp>
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/utility.hpp>
-#include <boost/spirit/error_handling.hpp>
-#include <boost/spirit/iterator/file_iterator.hpp>
-#if SPIRIT_VERSION >= 0x1800
-#define USE_ASSIGN_ACTOR
-#include <boost/spirit/actor/assign_actor.hpp>
-#endif
+#include <boost/spirit/include/classic_core.hpp>
+#include <boost/spirit/include/classic_utility.hpp>
+#include <boost/spirit/include/classic_error_handling.hpp>
+#include <boost/spirit/include/classic_file_iterator.hpp>
#include <boost/bind.hpp>
#include <string>