connectivity/source/cpool/ZConnectionPool.hxx | 6 +----- connectivity/source/cpool/ZConnectionWrapper.hxx | 4 +--- connectivity/source/cpool/ZDriverWrapper.hxx | 7 +------ connectivity/source/cpool/ZPoolCollection.hxx | 4 +--- connectivity/source/cpool/ZPooledConnection.hxx | 5 +---- 5 files changed, 5 insertions(+), 21 deletions(-)
New commits: commit 6a279e2d98d3aa2d11cc7b8c09158186795e7fcd Author: DuP-491 <[email protected]> AuthorDate: Sun Dec 13 20:58:01 2020 +0530 Commit: Ilmari Lauhakangas <[email protected]> CommitDate: Mon Dec 14 18:25:41 2020 +0100 tdf#124176 Use #pragma once in connectivity Change-Id: Ib817bcd477db276a9554b1b3bdc87cf91c2a6658 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107668 Reviewed-by: Ilmari Lauhakangas <[email protected]> Tested-by: Ilmari Lauhakangas <[email protected]> diff --git a/connectivity/source/cpool/ZConnectionPool.hxx b/connectivity/source/cpool/ZConnectionPool.hxx index b05c7d1ff275..e83d22849c0e 100644 --- a/connectivity/source/cpool/ZConnectionPool.hxx +++ b/connectivity/source/cpool/ZConnectionPool.hxx @@ -16,9 +16,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CONNECTIVITY_SOURCE_CPOOL_ZCONNECTIONPOOL_HXX -#define INCLUDED_CONNECTIVITY_SOURCE_CPOOL_ZCONNECTIONPOOL_HXX - +#pragma once #include <sal/config.h> #include <map> @@ -144,7 +142,5 @@ namespace connectivity void invalidatePooledConnections(); }; } -#endif // INCLUDED_CONNECTIVITY_SOURCE_CPOOL_ZCONNECTIONPOOL_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/cpool/ZConnectionWrapper.hxx b/connectivity/source/cpool/ZConnectionWrapper.hxx index b74fb244662c..e4b945fa9cfe 100644 --- a/connectivity/source/cpool/ZConnectionWrapper.hxx +++ b/connectivity/source/cpool/ZConnectionWrapper.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CONNECTIVITY_SOURCE_CPOOL_ZCONNECTIONWRAPPER_HXX -#define INCLUDED_CONNECTIVITY_SOURCE_CPOOL_ZCONNECTIONWRAPPER_HXX +#pragma once #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> @@ -74,6 +73,5 @@ namespace connectivity virtual void SAL_CALL close( ) override; }; } -#endif // INCLUDED_CONNECTIVITY_SOURCE_CPOOL_ZCONNECTIONWRAPPER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/cpool/ZDriverWrapper.hxx b/connectivity/source/cpool/ZDriverWrapper.hxx index 854542c31c76..b08cfc3ad9b4 100644 --- a/connectivity/source/cpool/ZDriverWrapper.hxx +++ b/connectivity/source/cpool/ZDriverWrapper.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CONNECTIVITY_SOURCE_CPOOL_ZDRIVERWRAPPER_HXX -#define INCLUDED_CONNECTIVITY_SOURCE_CPOOL_ZDRIVERWRAPPER_HXX +#pragma once #include <com/sun/star/sdbc/XDriver.hpp> #include <cppuhelper/implbase.hxx> @@ -71,8 +70,4 @@ namespace connectivity } // namespace connectivity - -#endif // INCLUDED_CONNECTIVITY_SOURCE_CPOOL_ZDRIVERWRAPPER_HXX - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/cpool/ZPoolCollection.hxx b/connectivity/source/cpool/ZPoolCollection.hxx index dc54e2f6b171..3da18ab86ab2 100644 --- a/connectivity/source/cpool/ZPoolCollection.hxx +++ b/connectivity/source/cpool/ZPoolCollection.hxx @@ -16,8 +16,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CONNECTIVITY_SOURCE_CPOOL_ZPOOLCOLLECTION_HXX -#define INCLUDED_CONNECTIVITY_SOURCE_CPOOL_ZPOOLCOLLECTION_HXX +#pragma once #include <sal/config.h> @@ -130,6 +129,5 @@ namespace connectivity virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) override; }; } -#endif // INCLUDED_CONNECTIVITY_SOURCE_CPOOL_ZPOOLCOLLECTION_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/cpool/ZPooledConnection.hxx b/connectivity/source/cpool/ZPooledConnection.hxx index 5f529f0c3c33..79450ea081d3 100644 --- a/connectivity/source/cpool/ZPooledConnection.hxx +++ b/connectivity/source/cpool/ZPooledConnection.hxx @@ -16,9 +16,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CONNECTIVITY_SOURCE_CPOOL_ZPOOLEDCONNECTION_HXX -#define INCLUDED_CONNECTIVITY_SOURCE_CPOOL_ZPOOLEDCONNECTION_HXX - +#pragma once #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> #include <com/sun/star/sdbc/XPooledConnection.hpp> @@ -56,6 +54,5 @@ namespace connectivity }; } -#endif // INCLUDED_CONNECTIVITY_SOURCE_CPOOL_ZPOOLEDCONNECTION_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
