From 7d7fea7f75524611238ce1b3546b95646cdcf359 Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Thu, 17 Oct 2019 15:20:31 +0200 Subject: make bin/update_pch.s always include code in trivial #if's MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit E.g. #ifdef LIBO_INTERNAL_ONLY is always true for code that builds with our PCHs. Change-Id: I3cf311ea3621b909105754cfea2cb0116b8b67f5 Reviewed-on: https://gerrit.libreoffice.org/80961 Tested-by: Jenkins Reviewed-by: Luboš Luňák --- chart2/inc/pch/precompiled_chartcontroller.hxx | 8 +++++--- chart2/inc/pch/precompiled_chartcore.hxx | 16 +++++++++++++--- 2 files changed, 18 insertions(+), 6 deletions(-) (limited to 'chart2') diff --git a/chart2/inc/pch/precompiled_chartcontroller.hxx b/chart2/inc/pch/precompiled_chartcontroller.hxx index f7745a5cbe19..febe636487c5 100644 --- a/chart2/inc/pch/precompiled_chartcontroller.hxx +++ b/chart2/inc/pch/precompiled_chartcontroller.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2019-09-25 11:00:52 using: + Generated on 2019-10-17 15:15:01 using: ./bin/update_pch chart2 chartcontroller --cutoff=6 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -41,6 +41,8 @@ #include #include #include +#include +#include #include #include #include @@ -65,6 +67,7 @@ #include #include #include +#include #include #include #include @@ -84,14 +87,12 @@ #include #include #include -#include #include #include #include #include #include #include -#include #include #include #include @@ -100,6 +101,7 @@ #include #include #include +#include #include #include #include diff --git a/chart2/inc/pch/precompiled_chartcore.hxx b/chart2/inc/pch/precompiled_chartcore.hxx index e5df2a9d5b01..1ae17f73c868 100644 --- a/chart2/inc/pch/precompiled_chartcore.hxx +++ b/chart2/inc/pch/precompiled_chartcore.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2019-04-29 21:18:43 using: + Generated on 2019-10-17 15:15:04 using: ./bin/update_pch chart2 chartcore --cutoff=3 --exclude:system --exclude:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -30,8 +30,10 @@ #include #include #include +#include #include #include +#include #endif // PCH_LEVEL >= 1 #if PCH_LEVEL >= 2 #include @@ -46,6 +48,7 @@ #include #include #include +#include #include #include #include @@ -56,8 +59,8 @@ #include #include #include -#include #include +#include #include #include #endif // PCH_LEVEL >= 2 @@ -117,6 +120,7 @@ #include #include #include +#include #include #include #include @@ -146,6 +150,7 @@ #include #include #include +#include #include #include #include @@ -158,7 +163,10 @@ #include #include #include +#include #include +#include +#include #include #include #include @@ -169,7 +177,9 @@ #include #include #include -#include +#include +#include +#include #include #include #include -- cgit ption value='distro/collabora/viewer2'>distro/collabora/viewer2 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2015-06-13TyposJulien Nabet