[ooo-build-commit] Branch 'ooo/master' - sdext/source

Jan Holesovsky kendy at kemper.freedesktop.org
Thu Sep 17 17:29:04 PDT 2009 

 sdext/source/pdfimport/pdfparse/makefile.mk  |    2 ++
 sdext/source/pdfimport/pdfparse/pdfparse.cxx |   12 ++++--------
 2 files changed, 6 insertions(+), 8 deletions(-)

New commits:
commit 101020e52ed064f875e89d841076b15cd8ed3dee
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Thu Sep 17 10:11:42 2009 +0000

    CWS-TOOLING: integrate CWS boost134
    2009-09-09 10:30:24 +0200 fs  r275970 : #i100127# provided by rene: check whether system-boost's function.hpp compiles without exception support
    2009-09-04 21:58:00 +0200 fs  r275832 : indention
    2009-09-04 21:57:10 +0200 fs  r275831 : #i10000# type in boost/spirit check. Thanks to thb
    2009-09-04 10:58:54 +0200 fs  r275787 : #i100127# provided by tono at openoffice.org: mingw needs using directives for std::min/max
    2009-09-04 10:31:54 +0200 fs  r275782 : #i100127# (approved by hjs) on Solaris, set GNUTAR to /usr/sfw/bin/gtar, this is available on baseline machines (Solaris 10.x), but not necessarily available in LD_LIBRARY_PATH
    2009-08-19 21:47:55 +0200 rene  r275161 : #i10000# check for the header actually used now
    2009-08-17 21:55:31 +0200 fs  r275073 : CWS-TOOLING: rebase CWS boost134 to trunk at 275001 (milestone: DEV300:m55)
    2009-07-16 09:39:25 +0200 fs  r274031 : #i100127# extract download/% with GNUTAR instead of TAR
    2009-07-14 09:18:15 +0200 fs  r273960 : CWS-TOOLING: rebase CWS boost134 to trunk at 273858 (milestone: DEV300:m52)
    2009-07-13 09:55:14 +0200 fs  r273919 : #i100127# use boost 1.39, not 1.34
    2009-07-13 09:45:57 +0200 fs  r273918 : use GNUTAR when extracting download/%.tar.gz, not TAR (necessary with boost 1.39 tarball)
    2009-07-10 21:10:52 +0200 fs  r273905 : #i100127# spirit now part of boost
    2009-07-06 12:12:13 +0200 fs  r273732 : #i10000# lngconvex, used in src/wizards, is built in shell => added missing module dependency
    2009-07-02 15:34:51 +0200 fs  r273660 : #i100127#
    2009-07-02 13:35:24 +0200 fs  r273645 : #i100127# MSVC needs some hinting when using boost::bind on (some) member functions
    2009-07-02 10:33:59 +0200 fs  r273625 : removed unused include (lead to an internal compiler error with MSVC and boost 1.34+)
    2009-07-02 09:44:35 +0200 fs  r273619 : change some include orders, prevents 'internal compiler errors' with MSVC
    2009-07-01 09:19:25 +0200 fs  r273547 : #i100127# who the heck is defining max as something unusable?
    2009-07-01 09:17:28 +0200 fs  r273546 : #i100127# defining min/max is causing trouble now
    2009-07-01 09:15:40 +0200 fs  r273545 : #i100127# reverted previous patch, and properly fixed the problem by defining BOOST_MEM_FN_ENABLE_CDECL, and disabling warning 4180
    2009-07-01 09:14:23 +0200 fs  r273544 : #i100127# re-disable warning 4180, still needed for some files
    2009-07-01 09:07:33 +0200 fs  r273543 : #i100127# reverted previous patch, and properly fixed the problem by defining BOOST_MEM_FN_ENABLE_CDECL
    2009-06-24 11:00:32 +0200 fs  r273319 : oops, re-introduced some inc locations
    2009-06-23 22:10:02 +0200 fs  r273304 : #i100127# disable warning C4180
    2009-06-23 22:08:36 +0200 fs  r273303 : #i100127# disable warning C4180
    2009-06-16 12:26:49 +0200 fs  r273015 : #i10000# (provided by mst at openoffice.org)
    2009-06-15 09:10:27 +0200 fs  r272962 : #i10000# use -r instead of -a when copying the include files, this prevents the spurious 'failed to preserve ownership' errors
    2009-06-11 23:55:06 +0200 fs  r272902 : #i100127#
    2009-06-11 23:54:47 +0200 fs  r272901 : #i100127#
    2009-06-11 23:54:05 +0200 fs  r272900 : make compile on unxsol[i|s]4
    2009-06-10 10:12:22 +0200 fs  r272798 : #i100127# don't deliver from within unxlngi6/misc/build/boost, but from a 'normalized' location unxlngi6/inc
    2009-06-10 09:48:00 +0200 fs  r272795 : #i100127# use 1.34.1 unconditionally on all platforms

diff --git a/sdext/source/pdfimport/pdfparse/makefile.mk b/sdext/source/pdfimport/pdfparse/makefile.mk
index 7249e52..9cbb5f1 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 59f88ad..abfc647 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>

More information about the ooo-build-commit mailing list