[Libreoffice-commits] core.git: bin/update_pch connectivity/inc slideshow/inc svx/inc

Michael Stahl mstahl at redhat.com
Fri Jan 22 01:15:37 PST 2016


 bin/update_pch                               |    1 +
 connectivity/inc/pch/precompiled_dbtools.hxx |    1 -
 slideshow/inc/pch/precompiled_slideshow.hxx  |    1 -
 svx/inc/pch/precompiled_svxcore.hxx          |    1 -
 4 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit cea94bd3cfd5d92696a57ef309b82a897762a3f5
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Jan 21 23:01:52 2016 +0100

    GCC PCH says -Werror=unused-macros BOOST_SPIRIT_DEBUG
    
    ... so try to blacklist that boost::spirit header, it is fortunately
    included only in one cxx file per library anyway.
    
    Change-Id: I95752540d33b2b20d7a185c05c4d4d15e660d956

diff --git a/bin/update_pch b/bin/update_pch
index 18eba85..037dca8 100755
--- a/bin/update_pch
+++ b/bin/update_pch
@@ -346,6 +346,7 @@ def filter_ignore(line, module):
             'LibreOfficeKit/LibreOfficeKitTypes.h', # Needs special directives
             'jerror.h',     # c++ unfriendly
             'jpeglib.h',    # c++ unfriendly
+            'boost/spirit/include/classic_core.hpp', # depends on BOOST_SPIRIT_DEBUG
             'svtools/editimplementation.hxx' # no direct include
         ]
 
diff --git a/connectivity/inc/pch/precompiled_dbtools.hxx b/connectivity/inc/pch/precompiled_dbtools.hxx
index 08fa14e..3babfec 100644
--- a/connectivity/inc/pch/precompiled_dbtools.hxx
+++ b/connectivity/inc/pch/precompiled_dbtools.hxx
@@ -40,7 +40,6 @@
 #include <boost/bind.hpp>
 #include <boost/noncopyable.hpp>
 #include <boost/optional.hpp>
-#include <boost/spirit/include/classic_core.hpp>
 #include <boost/type_traits.hpp>
 #include <osl/diagnose.h>
 #include <osl/mutex.hxx>
diff --git a/slideshow/inc/pch/precompiled_slideshow.hxx b/slideshow/inc/pch/precompiled_slideshow.hxx
index 542e135..8af7a5a 100644
--- a/slideshow/inc/pch/precompiled_slideshow.hxx
+++ b/slideshow/inc/pch/precompiled_slideshow.hxx
@@ -62,7 +62,6 @@
 #include <boost/optional.hpp>
 #include <boost/shared_array.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/spirit/include/classic_core.hpp>
 #include <boost/tuple/tuple.hpp>
 #include <boost/weak_ptr.hpp>
 #include <osl/diagnose.h>
diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx
index ee16117..62bc690 100644
--- a/svx/inc/pch/precompiled_svxcore.hxx
+++ b/svx/inc/pch/precompiled_svxcore.hxx
@@ -58,7 +58,6 @@
 #include <boost/noncopyable.hpp>
 #include <boost/optional.hpp>
 #include <boost/optional/optional.hpp>
-#include <boost/spirit/include/classic_core.hpp>
 #include <osl/conditn.h>
 #include <osl/conditn.hxx>
 #include <osl/diagnose.h>


More information about the Libreoffice-commits mailing list