From cf48347e7a56c38c000e657965f25f4c7e7b4803 Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Wed, 20 Sep 2017 23:04:09 +0300 Subject: Fresh run of bin/update_pch.sh Change-Id: I69d4157aaf6570cecd51ea59df20556914942e06 Reviewed-on: https://gerrit.libreoffice.org/42565 Tested-by: Jenkins Reviewed-by: Mike Kaganski --- connectivity/inc/pch/precompiled_ado.hxx | 9 ++-- connectivity/inc/pch/precompiled_calc.hxx | 12 ++--- connectivity/inc/pch/precompiled_dbase.hxx | 18 ++++--- connectivity/inc/pch/precompiled_dbpool2.hxx | 5 +- connectivity/inc/pch/precompiled_dbtools.hxx | 12 +++-- connectivity/inc/pch/precompiled_file.hxx | 55 +++++++++++++++++----- connectivity/inc/pch/precompiled_firebird_sdbc.hxx | 12 +++-- connectivity/inc/pch/precompiled_flat.hxx | 20 ++++++-- connectivity/inc/pch/precompiled_mysql.hxx | 11 ++--- connectivity/inc/pch/precompiled_odbc.hxx | 6 ++- .../inc/pch/precompiled_postgresql-sdbc-impl.hxx | 10 ++-- 11 files changed, 112 insertions(+), 58 deletions(-) (limited to 'connectivity') diff --git a/connectivity/inc/pch/precompiled_ado.hxx b/connectivity/inc/pch/precompiled_ado.hxx index 1e7ad135287a..69570d578641 100644 --- a/connectivity/inc/pch/precompiled_ado.hxx +++ b/connectivity/inc/pch/precompiled_ado.hxx @@ -13,18 +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 2015-12-02 12:47:53 using: + Generated on 2017-09-20 22:51:49 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: - ./bin/update_pch_bisect ./connectivity/inc/pch/precompiled_ado.hxx "/opt/lo/bin/make connectivity.build" --find-conflicts + ./bin/update_pch_bisect ./connectivity/inc/pch/precompiled_ado.hxx "make connectivity.build" --find-conflicts */ #include #include #include +#include #include -#include #include #include #include @@ -52,7 +52,6 @@ #include #include #include -#include #include #include #include @@ -70,7 +69,7 @@ #include // Cleanup windows header macro pollution. -#ifdef _WIN32 +#if defined(_WIN32) && defined(WINAPI) # include # undef RGB #endif diff --git a/connectivity/inc/pch/precompiled_calc.hxx b/connectivity/inc/pch/precompiled_calc.hxx index 14add4e56052..093e4299730e 100644 --- a/connectivity/inc/pch/precompiled_calc.hxx +++ b/connectivity/inc/pch/precompiled_calc.hxx @@ -13,18 +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 2015-11-14 14:16:28 using: + Generated on 2017-09-20 22:51:50 using: ./bin/update_pch connectivity calc --cutoff=2 --exclude:system --exclude:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: - ./bin/update_pch_bisect ./connectivity/inc/pch/precompiled_calc.hxx "/opt/lo/bin/make connectivity.build" --find-conflicts + ./bin/update_pch_bisect ./connectivity/inc/pch/precompiled_calc.hxx "make connectivity.build" --find-conflicts */ #include #include -#include +#include #include -#include +#include #include #include #include @@ -52,12 +52,10 @@ #include #include #include -#include #include #include #include -#include #include -#include +#include /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/pch/precompiled_dbase.hxx b/connectivity/inc/pch/precompiled_dbase.hxx index abc2e6592240..2f8e7efab671 100644 --- a/connectivity/inc/pch/precompiled_dbase.hxx +++ b/connectivity/inc/pch/precompiled_dbase.hxx @@ -13,11 +13,11 @@ 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 2015-11-14 14:16:28 using: + Generated on 2017-09-20 22:51:51 using: ./bin/update_pch connectivity dbase --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 ./connectivity/inc/pch/precompiled_dbase.hxx "/opt/lo/bin/make connectivity.build" --find-conflicts + ./bin/update_pch_bisect ./connectivity/inc/pch/precompiled_dbase.hxx "make connectivity.build" --find-conflicts */ #include @@ -91,7 +91,7 @@ #include #include #include -#include +#include #include #include #include @@ -101,24 +101,28 @@ #include #include #include +#include #include #include #include #include #include +#include #include #include +#include +#include #include #include #include #include #include #include -#include #include #include #include #include +#include #include #include #include @@ -126,6 +130,7 @@ #include #include #include +#include #include #include #include @@ -170,13 +175,13 @@ #include #include #include -#include -#include #include #include #include #include #include +#include +#include #include #include #include @@ -184,7 +189,6 @@ #include #include #include -#include #include #include #include diff --git a/connectivity/inc/pch/precompiled_dbpool2.hxx b/connectivity/inc/pch/precompiled_dbpool2.hxx index 98edcabb4352..7d7c425bb9b1 100644 --- a/connectivity/inc/pch/precompiled_dbpool2.hxx +++ b/connectivity/inc/pch/precompiled_dbpool2.hxx @@ -13,13 +13,14 @@ 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 2015-11-14 14:16:28 using: + Generated on 2017-09-20 22:51:53 using: ./bin/update_pch connectivity dbpool2 --cutoff=5 --exclude:system --include:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: - ./bin/update_pch_bisect ./connectivity/inc/pch/precompiled_dbpool2.hxx "/opt/lo/bin/make connectivity.build" --find-conflicts + ./bin/update_pch_bisect ./connectivity/inc/pch/precompiled_dbpool2.hxx "make connectivity.build" --find-conflicts */ +#include #include #include #include diff --git a/connectivity/inc/pch/precompiled_dbtools.hxx b/connectivity/inc/pch/precompiled_dbtools.hxx index a4999e5f5083..d968127a3d25 100644 --- a/connectivity/inc/pch/precompiled_dbtools.hxx +++ b/connectivity/inc/pch/precompiled_dbtools.hxx @@ -13,11 +13,11 @@ 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 2015-11-14 14:16:28 using: + Generated on 2017-09-20 22:51:54 using: ./bin/update_pch connectivity dbtools --cutoff=2 --exclude:system --exclude:module --include:local If after updating build fails, use the following command to locate conflicting headers: - ./bin/update_pch_bisect ./connectivity/inc/pch/precompiled_dbtools.hxx "/opt/lo/bin/make connectivity.build" --find-conflicts + ./bin/update_pch_bisect ./connectivity/inc/pch/precompiled_dbtools.hxx "make connectivity.build" --find-conflicts */ #include @@ -42,8 +42,10 @@ #include #include #include +#include #include #include +#include #include #include #include @@ -72,6 +74,7 @@ #include #include #include +#include #include #include #include @@ -101,7 +104,6 @@ #include #include #include -#include #include #include #include @@ -116,7 +118,6 @@ #include #include #include -#include #include #include #include @@ -140,6 +141,7 @@ #include #include #include +#include #include #include #include @@ -152,9 +154,11 @@ #include #include #include +#include #include #include #include +#include #include #include #include diff --git a/connectivity/inc/pch/precompiled_file.hxx b/connectivity/inc/pch/precompiled_file.hxx index bcbee91e5301..c1241c9feb74 100644 --- a/connectivity/inc/pch/precompiled_file.hxx +++ b/connectivity/inc/pch/precompiled_file.hxx @@ -13,11 +13,11 @@ 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 2015-11-14 14:16:28 using: + Generated on 2017-09-20 22:51:56 using: ./bin/update_pch connectivity file --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 ./connectivity/inc/pch/precompiled_file.hxx "/opt/lo/bin/make connectivity.build" --find-conflicts + ./bin/update_pch_bisect ./connectivity/inc/pch/precompiled_file.hxx "make connectivity.build" --find-conflicts */ #include @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include @@ -63,9 +62,9 @@ #include #include #include +#include #include #include -#include #include #include #include @@ -81,13 +80,12 @@ #include #include #include -#include #include #include #include #include #include -#include +#include #include #include #include @@ -95,13 +93,33 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include -#include #include +#include #include +#include #include #include #include @@ -109,12 +127,14 @@ #include #include #include +#include #include #include #include #include #include #include +#include #include #include #include @@ -125,7 +145,6 @@ #include #include #include -#include #include #include #include @@ -134,6 +153,7 @@ #include #include #include +#include #include #include #include @@ -154,8 +174,7 @@ #include #include #include -#include -#include +#include #include #include #include @@ -163,11 +182,17 @@ #include #include #include +#include +#include #include +#include +#include +#include #include +#include #include -#include #include +#include #include #include #include @@ -181,7 +206,15 @@ #include #include #include +#include +#include +#include +#include +#include #include +#include +#include +#include #include #include #include diff --git a/connectivity/inc/pch/precompiled_firebird_sdbc.hxx b/connectivity/inc/pch/precompiled_firebird_sdbc.hxx index 3838f23ade63..223999f9b793 100644 --- a/connectivity/inc/pch/precompiled_firebird_sdbc.hxx +++ b/connectivity/inc/pch/precompiled_firebird_sdbc.hxx @@ -13,19 +13,19 @@ 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 2015-11-14 14:16:28 using: + Generated on 2017-09-20 22:51:57 using: ./bin/update_pch connectivity firebird_sdbc --cutoff=2 --exclude:system --exclude:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: - ./bin/update_pch_bisect ./connectivity/inc/pch/precompiled_firebird_sdbc.hxx "/opt/lo/bin/make connectivity.build" --find-conflicts + ./bin/update_pch_bisect ./connectivity/inc/pch/precompiled_firebird_sdbc.hxx "make connectivity.build" --find-conflicts */ #include #include +#include #include #include #include -#include #include #include #include @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -48,6 +49,7 @@ #include #include #include +#include #include #include #include @@ -55,11 +57,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include #include diff --git a/connectivity/inc/pch/precompiled_flat.hxx b/connectivity/inc/pch/precompiled_flat.hxx index 73daefeac1ad..a3c299fb5632 100644 --- a/connectivity/inc/pch/precompiled_flat.hxx +++ b/connectivity/inc/pch/precompiled_flat.hxx @@ -13,15 +13,17 @@ 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 2015-11-14 14:16:28 using: + Generated on 2017-09-20 22:51:58 using: ./bin/update_pch connectivity flat --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 ./connectivity/inc/pch/precompiled_flat.hxx "/opt/lo/bin/make connectivity.build" --find-conflicts + ./bin/update_pch_bisect ./connectivity/inc/pch/precompiled_flat.hxx "make connectivity.build" --find-conflicts */ +#include #include #include +#include #include #include #include @@ -30,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -42,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -56,6 +60,7 @@ #include #include #include +#include #include #include #include @@ -81,7 +86,6 @@ #include #include #include -#include #include #include #include @@ -91,20 +95,23 @@ #include #include #include +#include #include #include #include #include #include +#include #include #include +#include +#include #include #include #include #include #include #include -#include #include #include #include @@ -147,7 +154,6 @@ #include #include #include -#include #include #include #include @@ -159,6 +165,7 @@ #include #include #include +#include #include #include #include @@ -179,6 +186,9 @@ #include #include #include +#include +#include +#include #include #include #include diff --git a/connectivity/inc/pch/precompiled_mysql.hxx b/connectivity/inc/pch/precompiled_mysql.hxx index 291cbefeefb7..a72882480159 100644 --- a/connectivity/inc/pch/precompiled_mysql.hxx +++ b/connectivity/inc/pch/precompiled_mysql.hxx @@ -13,11 +13,11 @@ 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 2015-11-14 14:16:28 using: + Generated on 2017-09-20 22:52:00 using: ./bin/update_pch connectivity mysql --cutoff=4 --exclude:system --include:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: - ./bin/update_pch_bisect ./connectivity/inc/pch/precompiled_mysql.hxx "/opt/lo/bin/make connectivity.build" --find-conflicts + ./bin/update_pch_bisect ./connectivity/inc/pch/precompiled_mysql.hxx "make connectivity.build" --find-conflicts */ #include @@ -71,7 +71,6 @@ #include #include #include -#include #include #include #include @@ -125,6 +124,7 @@ #include #include #include +#include #include #include #include @@ -134,15 +134,14 @@ #include #include #include +#include #include -#include #include #include #include #include #include #include -#include #include #include #include @@ -150,8 +149,6 @@ #include #include #include -#include -#include #include #include #include diff --git a/connectivity/inc/pch/precompiled_odbc.hxx b/connectivity/inc/pch/precompiled_odbc.hxx index 52e6327ae3e6..d2da616816f2 100644 --- a/connectivity/inc/pch/precompiled_odbc.hxx +++ b/connectivity/inc/pch/precompiled_odbc.hxx @@ -13,17 +13,19 @@ 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 2015-12-02 12:47:53 using: + Generated on 2017-09-20 22:52:01 using: ./bin/update_pch connectivity odbc --cutoff=2 --exclude:system --exclude:module --include:local If after updating build fails, use the following command to locate conflicting headers: - ./bin/update_pch_bisect ./connectivity/inc/pch/precompiled_odbc.hxx "/opt/lo/bin/make connectivity.build" --find-conflicts + ./bin/update_pch_bisect ./connectivity/inc/pch/precompiled_odbc.hxx "make connectivity.build" --find-conflicts */ #include #include +#include #include #include +#include #include #include #include diff --git a/connectivity/inc/pch/precompiled_postgresql-sdbc-impl.hxx b/connectivity/inc/pch/precompiled_postgresql-sdbc-impl.hxx index 816f561db79c..e7962126daf0 100644 --- a/connectivity/inc/pch/precompiled_postgresql-sdbc-impl.hxx +++ b/connectivity/inc/pch/precompiled_postgresql-sdbc-impl.hxx @@ -13,15 +13,16 @@ 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 2015-11-14 14:16:28 using: + Generated on 2017-09-20 22:52:02 using: ./bin/update_pch connectivity postgresql-sdbc-impl --cutoff=3 --exclude:system --exclude:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: - ./bin/update_pch_bisect ./connectivity/inc/pch/precompiled_postgresql-sdbc-impl.hxx "/opt/lo/bin/make connectivity.build" --find-conflicts + ./bin/update_pch_bisect ./connectivity/inc/pch/precompiled_postgresql-sdbc-impl.hxx "make connectivity.build" --find-conflicts */ +#include #include -#include +#include #include #include #include @@ -31,15 +32,18 @@ #include #include #include +#include #include #include #include #include #include +#include #include #include #include #include +#include #include #include #include -- cgit