include/cppuhelper/shlib.hxx | 5 ++++-
include/cppuhelper/supportsservice.hxx | 5 ++++-
include/cppuhelper/typeprovider.hxx | 5 ++++-
include/cppuhelper/unourl.hxx | 5 ++++-
include/cppuhelper/weak.hxx | 5 ++++-
include/cppuhelper/weakagg.hxx | 5 ++++-
include/cppuhelper/weakref.hxx | 5 ++++-
7 files changed, 28 insertions(+), 7 deletions(-)
New commits:
commit 54716495a19d5717ec7fdee47d48773148754efa
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Mon Jan 22 08:34:39 2024 +0100
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Mon Jan 22 09:56:41 2024 +0100
Revert "tdf#143148: Use pragma once instead of include guards"
This reverts commit eb9e4e7a6c7d11698a64489e22974574daabe823, see the note
in
the original description of
<https://bugs.documentfoundation.org/show_bug.cgi?id=143148#c0> "Use pragma
once
instead of include guards (Episode 2: Endgame)": "There are some source
files
containing include guards that are meant to also be processed by compilers
other
than LO's build baseline compilers: All URE include files [...] For those
source files, it is probably better to conservatively stick with include
guards
than to replace them with #pragma once."
Change-Id: I315aa935db8617fadd2fb807b6fa7da05f44359d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162288
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
diff --git a/include/cppuhelper/shlib.hxx b/include/cppuhelper/shlib.hxx
index e91862425166..07caef0eaa0d 100644
--- a/include/cppuhelper/shlib.hxx
+++ b/include/cppuhelper/shlib.hxx
@@ -20,7 +20,8 @@
/*
* This file is part of LibreOffice published API.
*/
-#pragma once
+#ifndef INCLUDED_CPPUHELPER_SHLIB_HXX
+#define INCLUDED_CPPUHELPER_SHLIB_HXX
#include "cppuhelper/cppuhelperdllapi.h"
#include "com/sun/star/uno/Reference.h"
@@ -81,4 +82,6 @@ SAL_CALL writeSharedLibComponentInfo(
} // end namespace cppu
+#endif
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/cppuhelper/supportsservice.hxx
b/include/cppuhelper/supportsservice.hxx
index 7d5bedb8270b..8834a3181f0b 100644
--- a/include/cppuhelper/supportsservice.hxx
+++ b/include/cppuhelper/supportsservice.hxx
@@ -11,7 +11,8 @@
* This file is part of LibreOffice published API.
*/
-#pragma once
+#ifndef INCLUDED_CPPUHELPER_SUPPORTSSERVICE_HXX
+#define INCLUDED_CPPUHELPER_SUPPORTSSERVICE_HXX
#include "sal/config.h"
@@ -47,4 +48,6 @@ bool CPPUHELPER_DLLPUBLIC supportsService(
}
+#endif
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/cppuhelper/typeprovider.hxx
b/include/cppuhelper/typeprovider.hxx
index e5590852e438..4c3bd99d1bb8 100644
--- a/include/cppuhelper/typeprovider.hxx
+++ b/include/cppuhelper/typeprovider.hxx
@@ -20,7 +20,8 @@
/*
* This file is part of LibreOffice published API.
*/
-#pragma once
+#ifndef INCLUDED_CPPUHELPER_TYPEPROVIDER_HXX
+#define INCLUDED_CPPUHELPER_TYPEPROVIDER_HXX
#include "sal/config.h"
@@ -226,4 +227,6 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
}
+#endif
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/cppuhelper/unourl.hxx b/include/cppuhelper/unourl.hxx
index 7f33abcd8843..45afaedad2e9 100644
--- a/include/cppuhelper/unourl.hxx
+++ b/include/cppuhelper/unourl.hxx
@@ -21,7 +21,8 @@
* This file is part of LibreOffice published API.
*/
-#pragma once
+#ifndef INCLUDED_CPPUHELPER_UNOURL_HXX
+#define INCLUDED_CPPUHELPER_UNOURL_HXX
#include "sal/config.h"
@@ -182,4 +183,6 @@ private:
};
}
+#endif // INCLUDED_RTL_UNOURL_HXX
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/cppuhelper/weak.hxx b/include/cppuhelper/weak.hxx
index bc87548f2fa9..a1a920ce4193 100644
--- a/include/cppuhelper/weak.hxx
+++ b/include/cppuhelper/weak.hxx
@@ -20,7 +20,8 @@
/*
* This file is part of LibreOffice published API.
*/
-#pragma once
+#ifndef INCLUDED_CPPUHELPER_WEAK_HXX
+#define INCLUDED_CPPUHELPER_WEAK_HXX
#include <cassert>
#include <cstddef>
@@ -178,4 +179,6 @@ static inline css::uno::XWeak* getXWeak(OWeakObject*
instance) { return instance
}
+#endif
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/cppuhelper/weakagg.hxx b/include/cppuhelper/weakagg.hxx
index a0f94f4433dd..0b770a42842b 100644
--- a/include/cppuhelper/weakagg.hxx
+++ b/include/cppuhelper/weakagg.hxx
@@ -20,7 +20,8 @@
/*
* This file is part of LibreOffice published API.
*/
-#pragma once
+#ifndef INCLUDED_CPPUHELPER_WEAKAGG_HXX
+#define INCLUDED_CPPUHELPER_WEAKAGG_HXX
#include "cppuhelper/weak.hxx"
#include "cppuhelper/weakref.hxx"
@@ -101,4 +102,6 @@ private:
}
+#endif
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/cppuhelper/weakref.hxx b/include/cppuhelper/weakref.hxx
index 4f6afb319ee1..a5858b2e8805 100644
--- a/include/cppuhelper/weakref.hxx
+++ b/include/cppuhelper/weakref.hxx
@@ -20,7 +20,8 @@
/*
* This file is part of LibreOffice published API.
*/
-#pragma once
+#ifndef INCLUDED_CPPUHELPER_WEAKREF_HXX
+#define INCLUDED_CPPUHELPER_WEAKREF_HXX
#include "sal/config.h"
@@ -222,4 +223,6 @@ public:
}
}
+#endif
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
