bin/update_pch | 4 ++--
connectivity/inc/pch/precompiled_ado.hxx | 6 +++---
solenv/clang-format/blacklist | 2 --
xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx | 6 +++---
4 files changed, 8 insertions(+), 10 deletions(-)
New commits:
commit cec7cd30fd5ce4b9c3dd04e39f80573d45f8476a
Author: Muhammet Kara <muhammet.k...@collabora.com>
AuthorDate: Fri Feb 7 00:07:25 2020 +0300
Commit: Muhammet Kara <muhammet.k...@collabora.com>
CommitDate: Fri Feb 7 00:07:31 2020 +0100
Remove erroneous whitespace in update_pch
This was causing generation of code in violation of clang-format
conformance in these files:
* xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx
* connectivity/inc/pch/precompiled_ado.hxx
Also remove these 2 files from the clang-format blacklist.
Change-Id: I882028c0553a3ff7fb356611f498d50dea984a7f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88143
Tested-by: Jenkins
Reviewed-by: Muhammet Kara <muhammet.k...@collabora.com>
diff --git a/bin/update_pch b/bin/update_pch
index 63e1d95faeec..8055007a3b25 100755
--- a/bin/update_pch
+++ b/bin/update_pch
@@ -891,8 +891,8 @@ def generate(includes, libname, filename, module):
ado_define = """
// Cleanup windows header macro pollution.
#if defined(_WIN32) && defined(WINAPI)
-# include <postwin.h>
-# undef RGB
+#include <postwin.h>
+#undef RGB
#endif
"""
f.write(ado_define)
diff --git a/connectivity/inc/pch/precompiled_ado.hxx
b/connectivity/inc/pch/precompiled_ado.hxx
index 90e1a8ed1129..ee8f95bcf312 100644
--- a/connectivity/inc/pch/precompiled_ado.hxx
+++ b/connectivity/inc/pch/precompiled_ado.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 2020-02-01 19:24:06 using:
+ Generated on 2020-02-07 00:17:17 using:
./bin/update_pch connectivity ado --cutoff=2 --exclude:system
--exclude:module --exclude:local
If after updating build fails, use the following command to locate
conflicting headers:
@@ -109,8 +109,8 @@
// Cleanup windows header macro pollution.
#if defined(_WIN32) && defined(WINAPI)
-# include <postwin.h>
-# undef RGB
+#include <postwin.h>
+#undef RGB
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 7b2278628ff2..e6e9b3d97eaf 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -1873,7 +1873,6 @@ configmgr/source/xcuparser.cxx
configmgr/source/xcuparser.hxx
configmgr/source/xmldata.cxx
configmgr/source/xmldata.hxx
-connectivity/inc/pch/precompiled_ado.hxx
connectivity/inc/strings.hxx
connectivity/qa/connectivity/ado/DriverTest.cxx
connectivity/qa/connectivity/commontools/FValue_test.cxx
@@ -18690,7 +18689,6 @@ xmlsecurity/inc/framework/xmlsignaturetemplateimpl.hxx
xmlsecurity/inc/gpg/SEInitializer.hxx
xmlsecurity/inc/gpg/xmlsignature_gpgimpl.hxx
xmlsecurity/inc/macrosecurity.hxx
-xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx
xmlsecurity/inc/xmlsec/saxhelper.hxx
xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
xmlsecurity/inc/xmlsec/xmlstreamio.hxx
diff --git a/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx
b/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx
index 51a26bd98cc4..d1d1c82f6eeb 100644
--- a/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx
+++ b/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.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-17 15:18:01 using:
+ Generated on 2020-02-07 00:16:39 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:
@@ -136,8 +136,8 @@
// Cleanup windows header macro pollution.
#if defined(_WIN32) && defined(WINAPI)
-# include <postwin.h>
-# undef RGB
+#include <postwin.h>
+#undef RGB
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
