summaryrefslogtreecommitdiff
path: root/xmlsecurity
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@collabora.com>2019-03-14 13:17:30 +0100
committerLuboš Luňák <l.lunak@collabora.com>2019-05-09 11:02:03 +0200
commitc6350b36860f3a3681722640b09f221489803e02 (patch)
treec0d4c458b8d6dc62757fd63daf5a28595aab462d /xmlsecurity
parenta3e92f9bcf72ebe94da181c0b1dd873ebbc2c9cc (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 'xmlsecurity')
-rw-r--r--xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx21
-rw-r--r--xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx51
2 files changed, 44 insertions, 28 deletions
diff --git a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx b/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx
index 66b40256ab26..a8af5e48b46a 100644
--- a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx
+++ b/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx
@@ -13,19 +13,18 @@
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-02-13 21:32:09 using:
+ Generated on 2019-04-29 21:19:21 using:
./bin/update_pch xmlsecurity xmlsecurity --cutoff=6 --exclude:system --include:module --include:local
If after updating build fails, use the following command to locate conflicting headers:
./bin/update_pch_bisect ./xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx "make xmlsecurity.build" --find-conflicts
*/
+#if PCH_LEVEL >= 1
#include <algorithm>
#include <cassert>
-#include <config_typesizes.h>
#include <cstddef>
#include <cstring>
-#include <deque>
#include <float.h>
#include <functional>
#include <iomanip>
@@ -42,8 +41,8 @@
#include <type_traits>
#include <utility>
#include <vector>
-#include <xmlsecuritydllapi.h>
-#include <xsecxmlsecdllapi.h>
+#endif // PCH_LEVEL >= 1
+#if PCH_LEVEL >= 2
#include <osl/diagnose.h>
#include <osl/doublecheckedlocking.h>
#include <osl/endian.h>
@@ -102,7 +101,8 @@
#include <vcl/vclevent.hxx>
#include <vcl/vclptr.hxx>
#include <vcl/vclreferencebase.hxx>
-#include <vcl/weld.hxx>
+#endif // PCH_LEVEL >= 2
+#if PCH_LEVEL >= 3
#include <basegfx/basegfxdllapi.h>
#include <basegfx/color/bcolor.hxx>
#include <basegfx/numeric/ftools.hxx>
@@ -122,7 +122,6 @@
#include <com/sun/star/accessibility/XAccessibleRelationSet.hpp>
#include <com/sun/star/awt/Key.hpp>
#include <com/sun/star/awt/KeyGroup.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
#include <com/sun/star/embed/StorageFormats.hpp>
#include <com/sun/star/io/XInputStream.hpp>
@@ -146,6 +145,7 @@
#include <com/sun/star/uno/XWeak.hpp>
#include <com/sun/star/uno/genfunc.h>
#include <com/sun/star/uno/genfunc.hxx>
+#include <com/sun/star/util/Date.hpp>
#include <com/sun/star/util/DateTime.hpp>
#include <com/sun/star/util/Time.hpp>
#include <com/sun/star/xml/crypto/DigestID.hpp>
@@ -170,8 +170,10 @@
#include <o3tl/cow_wrapper.hxx>
#include <o3tl/strong_int.hxx>
#include <o3tl/typed_flags_set.hxx>
+#include <o3tl/underlyingenumvalue.hxx>
#include <svl/sigstruct.hxx>
#include <tools/color.hxx>
+#include <tools/date.hxx>
#include <tools/fldunit.hxx>
#include <tools/fontenum.hxx>
#include <tools/gen.hxx>
@@ -188,6 +190,11 @@
#include <uno/sequence2.h>
#include <unotools/datetime.hxx>
#include <unotools/unotoolsdllapi.h>
+#endif // PCH_LEVEL >= 3
+#if PCH_LEVEL >= 4
+#include <xmlsecuritydllapi.h>
#include <xsecctl.hxx>
+#include <xsecxmlsecdllapi.h>
+#endif // PCH_LEVEL >= 4
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx b/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx
index 9862398c201f..e97bcfdb03e8 100644
--- a/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx
+++ b/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx
@@ -13,31 +13,30 @@
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:55:56 using:
+ Generated on 2019-04-29 21:19:21 using:
./bin/update_pch xmlsecurity xsec_xmlsec --cutoff=2 --exclude:system --include:module --include:local
If after updating build fails, use the following command to locate conflicting headers:
./bin/update_pch_bisect ./xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx "make xmlsecurity.build" --find-conflicts
*/
+#if PCH_LEVEL >= 1
#include <algorithm>
#include <cassert>
#include <cstddef>
-#include <cstdlib>
#include <cstring>
-#include <exception>
#include <iomanip>
#include <memory>
#include <new>
#include <ostream>
#include <pk11pub.h>
-#include <sstream>
-#include <stdio.h>
+#include <stddef.h>
#include <string.h>
-#include <string>
+#include <type_traits>
#include <utility>
-#include <xmlsec-wrapper.h>
-#include <xsecxmlsecdllapi.h>
+#include <vector>
+#endif // PCH_LEVEL >= 1
+#if PCH_LEVEL >= 2
#include <osl/diagnose.h>
#include <osl/doublecheckedlocking.h>
#include <osl/file.h>
@@ -51,8 +50,6 @@
#include <rtl/alloc.h>
#include <rtl/bootstrap.h>
#include <rtl/bootstrap.hxx>
-#include <rtl/byteseq.h>
-#include <rtl/byteseq.hxx>
#include <rtl/instance.hxx>
#include <rtl/malformeduriexception.hxx>
#include <rtl/random.h>
@@ -69,26 +66,31 @@
#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>
#include <sal/types.h>
-#include <biginteger.hxx>
+#include <sal/typesizes.h>
+#include <salhelper/singletonref.hxx>
+#include <vcl/dllapi.h>
+#include <vcl/errcode.hxx>
+#endif // PCH_LEVEL >= 2
+#if PCH_LEVEL >= 3
#include <com/sun/star/lang/DisposedException.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/uno/Any.h>
#include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/uno/Sequence.h>
#include <com/sun/star/uno/Sequence.hxx>
#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>
@@ -102,33 +104,40 @@
#include <com/sun/star/xml/csax/XCompressedDocumentHandler.hpp>
#include <com/sun/star/xml/csax/XMLAttribute.hpp>
#include <com/sun/star/xml/sax/SAXException.hpp>
-#include <com/sun/star/xml/sax/SAXParseException.hpp>
#include <com/sun/star/xml/sax/XAttributeList.hpp>
-#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
#include <com/sun/star/xml/sax/XLocator.hpp>
#include <com/sun/star/xml/wrapper/XXMLDocumentWrapper.hpp>
-#include <com/sun/star/xml/wrapper/XXMLElementWrapper.hpp>
+#include <comphelper/comphelperdllapi.h>
#include <cppu/cppudllapi.h>
#include <cppu/unotype.hxx>
#include <cppuhelper/cppuhelperdllapi.h>
-#include <cppuhelper/factory.hxx>
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/implbase_ex.hxx>
#include <cppuhelper/implbase_ex_post.hxx>
#include <cppuhelper/implbase_ex_pre.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/weak.hxx>
-#include <cppuhelper/weakagg.hxx>
-#include <cppuhelper/weakref.hxx>
#include <libxml/tree.h>
+#include <o3tl/typed_flags_set.hxx>
+#include <o3tl/underlyingenumvalue.hxx>
+#include <svl/svldllapi.h>
+#include <tools/lineend.hxx>
+#include <tools/ref.hxx>
+#include <tools/stream.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>
+#include <unotools/unotoolsdllapi.h>
#include <xmloff/dllapi.h>
+#endif // PCH_LEVEL >= 3
+#if PCH_LEVEL >= 4
+#include <xmlsec-wrapper.h>
+#include <xsecxmlsecdllapi.h>
+#endif // PCH_LEVEL >= 4
// Cleanup windows header macro pollution.
#if defined(_WIN32) && defined(WINAPI)