[Libreoffice-commits] core.git: cppuhelper/source cppu/source
George Bateman (via logerrit)
logerrit at kemper.freedesktop.org
Sun Sep 13 13:29:01 UTC 2020
cppu/source/helper/purpenv/Proxy.hxx | 5 +----
cppu/source/threadpool/current.hxx | 5 +----
cppu/source/threadpool/jobqueue.hxx | 5 +----
cppu/source/threadpool/thread.hxx | 5 +----
cppu/source/threadpool/threadpool.hxx | 5 +----
cppu/source/typelib/typelib.hxx | 5 +----
cppu/source/uno/IdentityMapping.hxx | 5 +----
cppu/source/uno/assign.hxx | 5 +----
cppu/source/uno/cascade_mapping.hxx | 5 +----
cppu/source/uno/constr.hxx | 5 +----
cppu/source/uno/copy.hxx | 5 +----
cppu/source/uno/destr.hxx | 5 +----
cppu/source/uno/eq.hxx | 5 +----
cppu/source/uno/loadmodule.hxx | 5 +----
cppu/source/uno/prim.hxx | 5 +----
cppuhelper/source/loadsharedlibcomponentfactory.hxx | 5 +----
cppuhelper/source/macro_expander.hxx | 5 +----
cppuhelper/source/paths.hxx | 5 +----
cppuhelper/source/servicemanager.hxx | 5 +----
cppuhelper/source/typemanager.hxx | 5 +----
20 files changed, 20 insertions(+), 80 deletions(-)
New commits:
commit 08cc983e26dd3252b12b253af9b0c3430e933321
Author: George Bateman <george.bateman16 at gmail.com>
AuthorDate: Sun Sep 13 11:57:19 2020 +0000
Commit: Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Sun Sep 13 15:28:21 2020 +0200
tdf#124176 Use #pragma once in cppu, cppuhelper
This commit was carried out by a Python script, source of which
is at https://bugs.documentfoundation.org/show_bug.cgi?id=124176#c97.
Change-Id: I0b7c5bec8e56bd21e719c8889fe263e377f3b8ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102547
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/cppu/source/helper/purpenv/Proxy.hxx b/cppu/source/helper/purpenv/Proxy.hxx
index 6f99ee7d42be..953abbf3b449 100644
--- a/cppu/source/helper/purpenv/Proxy.hxx
+++ b/cppu/source/helper/purpenv/Proxy.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_CPPU_SOURCE_HELPER_PURPENV_PROXY_HXX
-#define INCLUDED_CPPU_SOURCE_HELPER_PURPENV_PROXY_HXX
+#pragma once
#include <osl/interlck.h>
@@ -74,6 +73,4 @@ public:
extern "C" void Proxy_free(uno_ExtEnvironment * pEnv, void * pProxy) SAL_THROW_EXTERN_C();
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/threadpool/current.hxx b/cppu/source/threadpool/current.hxx
index ea26851ddb00..43eb809f9bff 100644
--- a/cppu/source/threadpool/current.hxx
+++ b/cppu/source/threadpool/current.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_CPPU_SOURCE_THREADPOOL_CURRENT_HXX
-#define INCLUDED_CPPU_SOURCE_THREADPOOL_CURRENT_HXX
+#pragma once
#include <sal/config.h>
@@ -42,6 +41,4 @@ struct IdContainer
IdContainer * getIdContainer();
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/threadpool/jobqueue.hxx b/cppu/source/threadpool/jobqueue.hxx
index 5a5c80479d2b..5b92f2476ed4 100644
--- a/cppu/source/threadpool/jobqueue.hxx
+++ b/cppu/source/threadpool/jobqueue.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_CPPU_SOURCE_THREADPOOL_JOBQUEUE_HXX
-#define INCLUDED_CPPU_SOURCE_THREADPOOL_JOBQUEUE_HXX
+#pragma once
#include <sal/config.h>
@@ -70,6 +69,4 @@ namespace cppu_threadpool
};
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/threadpool/thread.hxx b/cppu/source/threadpool/thread.hxx
index e9258a97b3ed..9873c214737e 100644
--- a/cppu/source/threadpool/thread.hxx
+++ b/cppu/source/threadpool/thread.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_CPPU_SOURCE_THREADPOOL_THREAD_HXX
-#define INCLUDED_CPPU_SOURCE_THREADPOOL_THREAD_HXX
+#pragma once
#include <osl/thread.hxx>
#include <sal/types.h>
@@ -65,6 +64,4 @@ namespace cppu_threadpool {
} // end cppu_threadpool
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/threadpool/threadpool.hxx b/cppu/source/threadpool/threadpool.hxx
index f473e2519348..e112f05805d0 100644
--- a/cppu/source/threadpool/threadpool.hxx
+++ b/cppu/source/threadpool/threadpool.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_CPPU_SOURCE_THREADPOOL_THREADPOOL_HXX
-#define INCLUDED_CPPU_SOURCE_THREADPOOL_THREADPOOL_HXX
+#pragma once
#include <vector>
#include <unordered_map>
@@ -159,6 +158,4 @@ namespace cppu_threadpool {
} // end namespace cppu_threadpool
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/typelib/typelib.hxx b/cppu/source/typelib/typelib.hxx
index b10b6eba8757..4d2e9cb7e6dc 100644
--- a/cppu/source/typelib/typelib.hxx
+++ b/cppu/source/typelib/typelib.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_CPPU_SOURCE_TYPELIB_HXX
-#define INCLUDED_CPPU_SOURCE_TYPELIB_HXX
+#pragma once
extern "C" sal_Int32 typelib_typedescription_getAlignedUnoSize(
const typelib_TypeDescription * pTypeDescription,
@@ -38,6 +37,4 @@ extern "C" void typelib_typedescriptionreference_getByName(
rtl_uString const * pName )
SAL_THROW_EXTERN_C();
-#endif // INCLUDED_CPPU_SOURCE_TYPELIB_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/uno/IdentityMapping.hxx b/cppu/source/uno/IdentityMapping.hxx
index fe2a644061bd..4a6db6d81bc1 100644
--- a/cppu/source/uno/IdentityMapping.hxx
+++ b/cppu/source/uno/IdentityMapping.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_CPPU_SOURCE_UNO_IDENTITYMAPPING_HXX
-#define INCLUDED_CPPU_SOURCE_UNO_IDENTITYMAPPING_HXX
+#pragma once
#include <uno/mapping.h>
@@ -26,6 +25,4 @@ namespace com::sun::star::uno { class Environment; }
uno_Mapping * createIdentityMapping(const css::uno::Environment & rEnv);
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/uno/assign.hxx b/cppu/source/uno/assign.hxx
index 97ee9cd5b9db..4e3d70f311b2 100644
--- a/cppu/source/uno/assign.hxx
+++ b/cppu/source/uno/assign.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_CPPU_SOURCE_UNO_ASSIGN_HXX
-#define INCLUDED_CPPU_SOURCE_UNO_ASSIGN_HXX
+#pragma once
#include "prim.hxx"
#include "destr.hxx"
@@ -450,6 +449,4 @@ inline bool _assignData(
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/uno/cascade_mapping.hxx b/cppu/source/uno/cascade_mapping.hxx
index 37f0f1d5b643..438143f6b7dd 100644
--- a/cppu/source/uno/cascade_mapping.hxx
+++ b/cppu/source/uno/cascade_mapping.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_CPPU_SOURCE_UNO_CASCADE_MAPPING_HXX
-#define INCLUDED_CPPU_SOURCE_UNO_CASCADE_MAPPING_HXX
+#pragma once
#include <uno/environment.h>
#include <uno/mapping.h>
@@ -30,6 +29,4 @@ void getCascadeMapping(uno_Mapping ** ppMapping,
uno_Environment * pTo,
rtl_uString * pAddPurpose );
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/uno/constr.hxx b/cppu/source/uno/constr.hxx
index 73d89b915d1f..9ca2eebf8e8f 100644
--- a/cppu/source/uno/constr.hxx
+++ b/cppu/source/uno/constr.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_CPPU_SOURCE_UNO_CONSTR_HXX
-#define INCLUDED_CPPU_SOURCE_UNO_CONSTR_HXX
+#pragma once
#include "prim.hxx"
#include <osl/diagnose.h>
@@ -136,6 +135,4 @@ inline void _defaultConstructData(
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/uno/copy.hxx b/cppu/source/uno/copy.hxx
index b61973ec0b7f..6a71d413faee 100644
--- a/cppu/source/uno/copy.hxx
+++ b/cppu/source/uno/copy.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_CPPU_SOURCE_UNO_COPY_HXX
-#define INCLUDED_CPPU_SOURCE_UNO_COPY_HXX
+#pragma once
#include "prim.hxx"
#include "constr.hxx"
@@ -653,6 +652,4 @@ inline void _copyConstructData(
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/uno/destr.hxx b/cppu/source/uno/destr.hxx
index 1b964e36a698..13e4ca044c3a 100644
--- a/cppu/source/uno/destr.hxx
+++ b/cppu/source/uno/destr.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_CPPU_SOURCE_UNO_DESTR_HXX
-#define INCLUDED_CPPU_SOURCE_UNO_DESTR_HXX
+#pragma once
#include <sal/config.h>
#include <osl/diagnose.h>
@@ -350,6 +349,4 @@ inline void _destructData(
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/uno/eq.hxx b/cppu/source/uno/eq.hxx
index 59401ad34b3c..6287cdcc3506 100644
--- a/cppu/source/uno/eq.hxx
+++ b/cppu/source/uno/eq.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_CPPU_SOURCE_UNO_EQ_HXX
-#define INCLUDED_CPPU_SOURCE_UNO_EQ_HXX
+#pragma once
#include <cmath>
#include <string.h>
@@ -591,6 +590,4 @@ inline bool _equalData(
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/uno/loadmodule.hxx b/cppu/source/uno/loadmodule.hxx
index cde33594ce06..4d6c322c1078 100644
--- a/cppu/source/uno/loadmodule.hxx
+++ b/cppu/source/uno/loadmodule.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_CPPU_SOURCE_UNO_LOADMODULE_HXX
-#define INCLUDED_CPPU_SOURCE_UNO_LOADMODULE_HXX
+#pragma once
#include <sal/config.h>
#include <rtl/ustring.hxx>
@@ -43,6 +42,4 @@ bool loadModule(osl::Module & rModule, OUString const & name);
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/source/uno/prim.hxx b/cppu/source/uno/prim.hxx
index 84f96e7fd38f..733baec0f6f1 100644
--- a/cppu/source/uno/prim.hxx
+++ b/cppu/source/uno/prim.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_CPPU_SOURCE_UNO_PRIM_HXX
-#define INCLUDED_CPPU_SOURCE_UNO_PRIM_HXX
+#pragma once
#include <typelib/typedescription.h>
#include <typelib/typeclass.h>
@@ -151,6 +150,4 @@ inline bool _type_equals(
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/source/loadsharedlibcomponentfactory.hxx b/cppuhelper/source/loadsharedlibcomponentfactory.hxx
index 033fc8f3263b..3678c32e76fb 100644
--- a/cppuhelper/source/loadsharedlibcomponentfactory.hxx
+++ b/cppuhelper/source/loadsharedlibcomponentfactory.hxx
@@ -7,8 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_CPPUHELPER_SOURCE_LOADSHAREDLIBCOMPONENTFACTORY_HXX
-#define INCLUDED_CPPUHELPER_SOURCE_LOADSHAREDLIBCOMPONENTFACTORY_HXX
+#pragma once
#include <sal/config.h>
@@ -39,6 +38,4 @@ void loadSharedLibComponentFactory(
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/source/macro_expander.hxx b/cppuhelper/source/macro_expander.hxx
index 4a2740beb965..11736656c0f6 100644
--- a/cppuhelper/source/macro_expander.hxx
+++ b/cppuhelper/source/macro_expander.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_CPPUHELPER_SOURCE_MACRO_EXPANDER_HXX
-#define INCLUDED_CPPUHELPER_SOURCE_MACRO_EXPANDER_HXX
+#pragma once
#include <sal/config.h>
@@ -54,6 +53,4 @@ create_bootstrap_macro_expander_factory();
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/source/paths.hxx b/cppuhelper/source/paths.hxx
index baad8c68c4ac..9ce486fa772a 100644
--- a/cppuhelper/source/paths.hxx
+++ b/cppuhelper/source/paths.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_CPPUHELPER_SOURCE_PATHS_HXX
-#define INCLUDED_CPPUHELPER_SOURCE_PATHS_HXX
+#pragma once
#include <sal/config.h>
#include <rtl/ustring.hxx>
@@ -35,6 +34,4 @@ void decodeRdbUri(OUString * uri, bool * optional, bool * directory);
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/source/servicemanager.hxx b/cppuhelper/source/servicemanager.hxx
index ceac7c15a698..9a7cac513402 100644
--- a/cppuhelper/source/servicemanager.hxx
+++ b/cppuhelper/source/servicemanager.hxx
@@ -7,8 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_CPPUHELPER_SOURCE_SERVICEMANAGER_HXX
-#define INCLUDED_CPPUHELPER_SOURCE_SERVICEMANAGER_HXX
+#pragma once
#include <sal/config.h>
@@ -346,6 +345,4 @@ private:
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/source/typemanager.hxx b/cppuhelper/source/typemanager.hxx
index bc086693a631..a1d6ce8cd78a 100644
--- a/cppuhelper/source/typemanager.hxx
+++ b/cppuhelper/source/typemanager.hxx
@@ -7,8 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_CPPUHELPER_SOURCE_TYPEMANAGER_HXX
-#define INCLUDED_CPPUHELPER_SOURCE_TYPEMANAGER_HXX
+#pragma once
#include <sal/config.h>
@@ -123,6 +122,4 @@ private:
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list