From c6350b36860f3a3681722640b09f221489803e02 Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Thu, 14 Mar 2019 13:17:30 +0100 Subject: regenerate PCH headers for the 4 new levels MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Plus some build fixes triggered by this. Change-Id: I59b21def706598ceffd45ae5b1f0262ec9c1ad50 Reviewed-on: https://gerrit.libreoffice.org/71581 Tested-by: Jenkins Reviewed-by: Luboš Luňák --- svx/inc/pch/precompiled_svx.hxx | 93 +++++++++-------------- svx/inc/pch/precompiled_svxcore.hxx | 147 ++++++++++-------------------------- 2 files changed, 74 insertions(+), 166 deletions(-) (limited to 'svx/inc') diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index 71417c0d1bc4..1a8bf8e583fc 100644 --- a/svx/inc/pch/precompiled_svx.hxx +++ b/svx/inc/pch/precompiled_svx.hxx @@ -13,26 +13,21 @@ 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 2018-08-29 17:19:11 using: + Generated on 2019-04-29 21:19:04 using: ./bin/update_pch svx svx --cutoff=3 --exclude:system --exclude:module --include:local If after updating build fails, use the following command to locate conflicting headers: ./bin/update_pch_bisect ./svx/inc/pch/precompiled_svx.hxx "make svx.build" --find-conflicts */ +#if PCH_LEVEL >= 1 #include #include #include -#include -#include -#include -#include #include #include #include -#include #include -#include #include #include #include @@ -46,6 +41,8 @@ #include #include #include +#endif // PCH_LEVEL >= 1 +#if PCH_LEVEL >= 2 #include #include #include @@ -59,7 +56,6 @@ #include #include #include -#include #include #include #include @@ -82,12 +78,11 @@ #include #include #include -#include #include #include #include -#include #include +#include #include #include #include @@ -98,7 +93,6 @@ #include #include #include -#include #include #include #include @@ -111,36 +105,42 @@ #include #include #include +#include #include #include #include #include -#include +#include +#include #include #include #include #include #include #include +#include #include -#include #include #include #include -#include #include #include +#include #include #include #include #include #include +#include +#include #include #include #include #include #include #include +#endif // PCH_LEVEL >= 2 +#if PCH_LEVEL >= 3 #include #include #include @@ -161,20 +161,16 @@ #include #include #include -#include #include #include -#include #include #include #include #include #include -#include #include #include #include -#include #include #include #include @@ -195,30 +191,15 @@ #include #include #include -#include -#include #include #include -#include #include #include #include -#include #include #include -#include #include -#include -#include -#include -#include -#include -#include -#include #include -#include -#include -#include #include #include #include @@ -229,19 +210,16 @@ #include #include #include -#include #include #include #include #include #include #include -#include #include #include #include #include -#include #include #include #include @@ -259,6 +237,7 @@ #include #include #include +#include #include #include #include @@ -268,7 +247,6 @@ #include #include #include -#include #include #include #include @@ -305,17 +283,19 @@ #include #include #include +#include #include +#include +#include #include #include #include #include #include -#include -#include #include #include #include +#include #include #include #include @@ -337,9 +317,9 @@ #include #include #include -#include -#include #include +#include +#include #include #include #include @@ -354,12 +334,7 @@ #include #include #include -#include -#include -#include #include -#include -#include #include #include #include @@ -371,15 +346,16 @@ #include #include #include +#include #include #include #include #include -#include #include #include #include #include +#include #include #include #include @@ -394,12 +370,13 @@ #include #include #include -#include #include +#include #include #include #include #include +#include #include #include #include @@ -409,8 +386,8 @@ #include #include #include +#include #include -#include #include #include #include @@ -420,27 +397,27 @@ #include #include #include -#include -#include #include #include #include #include #include -#include #include #include #include #include #include #include +#endif // PCH_LEVEL >= 3 +#if PCH_LEVEL >= 4 +#include #include #include -#include #include #include #include #include +#include #include #include #include @@ -462,9 +439,11 @@ #include #include #include +#include #include #include #include +#include #include #include #include @@ -517,11 +496,7 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include +#endif // PCH_LEVEL >= 4 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx index ee101da6d5a8..d2d6dd8cc6a7 100644 --- a/svx/inc/pch/precompiled_svxcore.hxx +++ b/svx/inc/pch/precompiled_svxcore.hxx @@ -13,52 +13,42 @@ 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 2017-09-20 22:54:18 using: + Generated on 2019-04-29 21:19:04 using: ./bin/update_pch svx svxcore --cutoff=7 --exclude:system --include:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: ./bin/update_pch_bisect ./svx/inc/pch/precompiled_svxcore.hxx "make svx.build" --find-conflicts */ +#if PCH_LEVEL >= 1 #include #include -#include -#include -#include -#include #include -#include #include #include -#include #include #include #include #include #include #include -#include #include #include #include #include #include #include -#include #include #include #include -#include #include #include #include -#include #include #include #include -#include -#include -#include +#endif // PCH_LEVEL >= 1 +#if PCH_LEVEL >= 2 #include #include #include @@ -66,8 +56,6 @@ #include #include #include -#include -#include #include #include #include @@ -85,7 +73,6 @@ #include #include #include -#include #include #include #include @@ -93,8 +80,8 @@ #include #include #include +#include #include -#include #include #include #include @@ -103,10 +90,15 @@ #include #include #include +#include #include -#include +#include +#include +#include +#include #include #include +#include #include #include #include @@ -117,23 +109,22 @@ #include #include #include -#include -#include +#include #include #include #include #include #include -#include +#include #include #include #include #include #include -#include #include #include #include +#include #include #include #include @@ -142,30 +133,33 @@ #include #include #include -#include -#include +#include #include +#include +#include #include -#include #include -#include #include #include #include #include #include #include +#include +#include +#include #include #include #include #include #include #include +#include #include -#include +#endif // PCH_LEVEL >= 2 +#if PCH_LEVEL >= 3 #include #include -#include #include #include #include @@ -188,43 +182,23 @@ #include #include #include -#include #include -#include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include #include #include +#include #include #include #include +#include #include #include #include #include -#include +#include #include -#include #include #include #include @@ -232,9 +206,7 @@ #include #include #include -#include #include -#include #include #include #include @@ -242,32 +214,16 @@ #include #include #include -#include -#include +#include #include -#include -#include -#include -#include -#include -#include -#include -#include #include #include -#include #include #include #include -#include #include -#include -#include -#include -#include #include #include -#include #include #include #include @@ -275,16 +231,11 @@ #include #include #include -#include -#include -#include #include #include -#include #include #include #include -#include #include #include #include @@ -305,24 +256,14 @@ #include #include #include -#include -#include -#include #include -#include -#include -#include #include #include #include -#include -#include #include #include #include -#include #include -#include #include #include #include @@ -338,15 +279,12 @@ #include #include #include -#include #include #include #include #include #include -#include #include -#include #include #include #include @@ -366,9 +304,11 @@ #include #include #include +#include #include #include #include +#include #include #include #include @@ -391,17 +331,16 @@ #include #include #include -#include +#include #include #include +#include #include #include -#include #include #include #include #include -#include #include #include #include @@ -423,19 +362,15 @@ #include #include #include +#include #include #include -#include #include -#include -#include #include -#include -#include -#include #include #include #include +#include #include #include #include @@ -445,7 +380,6 @@ #include #include #include -#include #include #include #include @@ -463,19 +397,20 @@ #include #include #include -#include -#include #include +#include #include #include #include -#include #include #include #include #include #include #include +#endif // PCH_LEVEL >= 3 +#if PCH_LEVEL >= 4 +#include #include #include #include @@ -500,6 +435,7 @@ #include #include #include +#include #include #include #include @@ -573,7 +509,6 @@ #include #include #include -#include #include #include #include @@ -585,8 +520,6 @@ #include #include #include -#include -#include -#include +#endif // PCH_LEVEL >= 4 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit