diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2019-10-17 15:20:31 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2019-10-18 11:00:04 +0200 |
| commit | 7d7fea7f75524611238ce1b3546b95646cdcf359 (patch) | |
| tree | 0b8f8b14ab4c35653923be643701599135b18612 /svx/inc/pch | |
| parent | 06cfc566a4734bd8d517920d3dfc210afe068295 (diff) | |
make bin/update_pch.s always include code in trivial #if's
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 <l.lunak@collabora.com>
Diffstat (limited to 'svx/inc/pch')
| -rw-r--r-- | svx/inc/pch/precompiled_svx.hxx | 6 | ||||
| -rw-r--r-- | svx/inc/pch/precompiled_svxcore.hxx | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index 85a2bc8ba450..93bf3e6a13d6 100644 --- a/svx/inc/pch/precompiled_svx.hxx +++ b/svx/inc/pch/precompiled_svx.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-10-11 13:05:53 using: + Generated on 2019-10-17 16:11:41 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: @@ -59,8 +59,11 @@ #include <rtl/instance.hxx> #include <rtl/math.hxx> #include <rtl/ref.hxx> +#include <rtl/strbuf.h> #include <rtl/string.h> #include <rtl/string.hxx> +#include <rtl/stringconcat.hxx> +#include <rtl/stringutils.hxx> #include <rtl/tencinfo.h> #include <rtl/textenc.h> #include <rtl/uri.hxx> @@ -384,6 +387,7 @@ #include <unotools/localedatawrapper.hxx> #include <unotools/options.hxx> #include <unotools/pathoptions.hxx> +#include <unotools/syslocale.hxx> #include <unotools/unotoolsdllapi.h> #include <unotools/viewoptions.hxx> #endif // PCH_LEVEL >= 3 diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx index 3978d42f17cd..ea9506e07fb9 100644 --- a/svx/inc/pch/precompiled_svxcore.hxx +++ b/svx/inc/pch/precompiled_svxcore.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-10-11 13:06:07 using: + Generated on 2019-10-17 16:11:39 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: @@ -28,6 +28,7 @@ #include <deque> #include <float.h> #include <functional> +#include <initializer_list> #include <iomanip> #include <limits.h> #include <limits> @@ -41,6 +42,8 @@ #include <stack> #include <stddef.h> #include <string.h> +#include <string> +#include <string_view> #include <type_traits> #include <typeinfo> #include <unordered_map> @@ -58,6 +61,7 @@ #include <osl/interlck.h> #include <osl/mutex.hxx> #include <osl/process.h> +#include <osl/thread.h> #include <osl/time.h> #include <rtl/alloc.h> #include <rtl/character.hxx> @@ -71,6 +75,7 @@ #include <rtl/strbuf.hxx> #include <rtl/string.h> #include <rtl/string.hxx> +#include <rtl/stringconcat.hxx> #include <rtl/stringutils.hxx> #include <rtl/textcvt.h> #include <rtl/textenc.h> |