ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Remove erroneous whitespace in update_pch

Browse Source 
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.kara@collabora.com>
This commit is contained in:
Muhammet Kara
2020-02-07 00:07:31 +01:00
parent 87a8b2c0d1
commit cec7cd30fd
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/update_pch
+2 -2
View File
@@ -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)
connectivity/inc/pch/precompiled_ado.hxx
+3 -3
View File
@@ -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: */
solenv/clang-format/blacklist
-2
View File
@@ -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
xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx
+3 -3
View File
@@ -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: */