diff options
author | Luboš Luňák <l.lunak@collabora.com> | 2019-03-14 13:17:30 +0100 |
---|---|---|
committer | Luboš Luňák <l.lunak@collabora.com> | 2019-05-09 11:02:03 +0200 |
commit | c6350b36860f3a3681722640b09f221489803e02 (patch) | |
tree | c0d4c458b8d6dc62757fd63daf5a28595aab462d /package | |
parent | a3e92f9bcf72ebe94da181c0b1dd873ebbc2c9cc (diff) |
regenerate PCH headers for the 4 new levels
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 <l.lunak@collabora.com>
Diffstat (limited to 'package')
-rw-r--r-- | package/inc/pch/precompiled_package2.hxx | 64 | ||||
-rw-r--r-- | package/inc/pch/precompiled_xstor.hxx | 24 |
2 files changed, 49 insertions, 39 deletions
diff --git a/package/inc/pch/precompiled_package2.hxx b/package/inc/pch/precompiled_package2.hxx index 57da3538fca5..de5cc736f693 100644 --- a/package/inc/pch/precompiled_package2.hxx +++ b/package/inc/pch/precompiled_package2.hxx @@ -13,38 +13,36 @@ 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:52:47 using: + Generated on 2019-04-29 21:18:44 using: ./bin/update_pch package package2 --cutoff=3 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: ./bin/update_pch_bisect ./package/inc/pch/precompiled_package2.hxx "make package.build" --find-conflicts */ +#if PCH_LEVEL >= 1 #include <algorithm> #include <cassert> -#include <config_global.h> -#include <config_typesizes.h> #include <cstddef> -#include <cstdlib> #include <cstring> -#include <exception> -#include <functional> #include <iomanip> +#include <limits> +#include <math.h> #include <memory> #include <new> #include <ostream> -#include <sstream> #include <stddef.h> #include <string.h> -#include <string> #include <type_traits> #include <unordered_map> #include <utility> #include <vector> -#include <boost/optional/optional.hpp> +#endif // PCH_LEVEL >= 1 +#if PCH_LEVEL >= 2 #include <osl/diagnose.h> #include <osl/diagnose.hxx> #include <osl/doublecheckedlocking.h> +#include <osl/endian.h> #include <osl/getglobalmutex.hxx> #include <osl/interlck.h> #include <osl/mutex.h> @@ -56,8 +54,12 @@ #include <rtl/crc.h> #include <rtl/digest.h> #include <rtl/instance.hxx> +#include <rtl/math.h> +#include <rtl/math.hxx> #include <rtl/random.h> #include <rtl/ref.hxx> +#include <rtl/strbuf.h> +#include <rtl/strbuf.hxx> #include <rtl/string.h> #include <rtl/string.hxx> #include <rtl/stringutils.hxx> @@ -69,27 +71,21 @@ #include <rtl/ustring.h> #include <rtl/ustring.hxx> #include <sal/config.h> -#include <sal/detail/log.h> #include <sal/log.hxx> #include <sal/macros.h> +#include <sal/mathconf.h> #include <sal/saldllapi.h> #include <sal/types.h> #include <sal/typesizes.h> #include <salhelper/salhelperdllapi.h> #include <salhelper/simplereferenceobject.hxx> -#include <CRC32.hxx> -#include <EncryptedDataHeader.hxx> -#include <EncryptionData.hxx> -#include <PackageConstants.hxx> -#include <ZipEntry.hxx> -#include <ZipEnumeration.hxx> -#include <ZipFile.hxx> -#include <ZipOutputEntry.hxx> -#include <ZipOutputStream.hxx> -#include <ZipPackage.hxx> -#include <ZipPackageBuffer.hxx> -#include <ZipPackageFolder.hxx> -#include <ZipPackageStream.hxx> +#endif // PCH_LEVEL >= 2 +#if PCH_LEVEL >= 3 +#include <basegfx/basegfxdllapi.h> +#include <basegfx/color/bcolor.hxx> +#include <basegfx/numeric/ftools.hxx> +#include <basegfx/tuple/b3dtuple.hxx> +#include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/embed/StorageFormats.hpp> #include <com/sun/star/io/TempFile.hpp> @@ -114,8 +110,6 @@ #include <com/sun/star/uno/Type.h> #include <com/sun/star/uno/Type.hxx> #include <com/sun/star/uno/TypeClass.hdl> -#include <com/sun/star/uno/XAggregation.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/uno/XWeak.hpp> #include <com/sun/star/uno/genfunc.h> @@ -138,14 +132,30 @@ #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/weak.hxx> -#include <cppuhelper/weakagg.hxx> -#include <cppuhelper/weakref.hxx> +#include <o3tl/underlyingenumvalue.hxx> +#include <tools/toolsdllapi.h> #include <typelib/typeclass.h> #include <typelib/typedescription.h> #include <typelib/uik.h> #include <uno/any2.h> #include <uno/data.h> #include <uno/sequence2.h> +#endif // PCH_LEVEL >= 3 +#if PCH_LEVEL >= 4 +#include <CRC32.hxx> +#include <EncryptedDataHeader.hxx> +#include <EncryptionData.hxx> +#include <PackageConstants.hxx> +#include <ZipEntry.hxx> +#include <ZipEnumeration.hxx> +#include <ZipFile.hxx> +#include <ZipOutputEntry.hxx> +#include <ZipOutputStream.hxx> +#include <ZipPackage.hxx> +#include <ZipPackageBuffer.hxx> +#include <ZipPackageFolder.hxx> +#include <ZipPackageStream.hxx> #include <package/packagedllapi.hxx> +#endif // PCH_LEVEL >= 4 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/pch/precompiled_xstor.hxx b/package/inc/pch/precompiled_xstor.hxx index f4b9cba3d6f2..6306c5846efd 100644 --- a/package/inc/pch/precompiled_xstor.hxx +++ b/package/inc/pch/precompiled_xstor.hxx @@ -13,27 +13,27 @@ 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:52:48 using: + Generated on 2019-04-29 21:18:44 using: ./bin/update_pch package xstor --cutoff=2 --exclude:system --include:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: ./bin/update_pch_bisect ./package/inc/pch/precompiled_xstor.hxx "make package.build" --find-conflicts */ +#if PCH_LEVEL >= 1 #include <algorithm> #include <cassert> -#include <config_typesizes.h> #include <cstddef> -#include <cstdlib> -#include <cstring> #include <iomanip> +#include <limits> #include <memory> #include <new> #include <ostream> -#include <sstream> #include <stddef.h> #include <string.h> -#include <string> +#include <utility> +#endif // PCH_LEVEL >= 1 +#if PCH_LEVEL >= 2 #include <osl/diagnose.h> #include <osl/interlck.h> #include <osl/mutex.h> @@ -51,7 +51,6 @@ #include <rtl/ustring.h> #include <rtl/ustring.hxx> #include <sal/config.h> -#include <sal/detail/log.h> #include <sal/log.hxx> #include <sal/macros.h> #include <sal/saldllapi.h> @@ -59,6 +58,8 @@ #include <sal/typesizes.h> #include <salhelper/salhelperdllapi.h> #include <salhelper/simplereferenceobject.hxx> +#endif // PCH_LEVEL >= 2 +#if PCH_LEVEL >= 3 #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/embed/StorageFormats.hpp> @@ -68,12 +69,8 @@ #include <com/sun/star/io/TempFile.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/lang/XSingleComponentFactory.hpp> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/packages/WrongPasswordException.hpp> -#include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/ucb/SimpleFileAccess.hpp> #include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Any.hxx> @@ -82,7 +79,6 @@ #include <com/sun/star/uno/Type.h> #include <com/sun/star/uno/Type.hxx> #include <com/sun/star/uno/TypeClass.hdl> -#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/uno/genfunc.h> #include <com/sun/star/uno/genfunc.hxx> @@ -96,11 +92,15 @@ #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/typeprovider.hxx> +#include <tools/diagnose_ex.h> #include <typelib/typeclass.h> #include <typelib/typedescription.h> #include <typelib/uik.h> #include <uno/any2.h> #include <uno/data.h> #include <uno/sequence2.h> +#endif // PCH_LEVEL >= 3 +#if PCH_LEVEL >= 4 +#endif // PCH_LEVEL >= 4 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |