summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-10-01 00:07:23 +0200
committerMichael Stahl <mstahl@redhat.com>2013-10-01 08:54:53 +0000
commit54f7c0ae8bd65100fa1fa6e574ed39247a8090dc (patch)
tree781ee1fe8752bbdb46509ed43eb4a57a71377524
parent7c7e80fb41e476d2858f7003f294d8688f242a31 (diff)
All the content of cppuhelper/source/compat.cxx must be in namespace cppu
(cherry picked from commit 69f1846f4095a9dc607a0e568980d8625d657c94) Conflicts: cppuhelper/source/compat.cxx Change-Id: I30dde10d1c299dbd9c0b2cb2fa025ce432df6cce Reviewed-on: https://gerrit.libreoffice.org/6098 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r--cppuhelper/source/compat.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/cppuhelper/source/compat.cxx b/cppuhelper/source/compat.cxx
index c24a8a846b39..8d13116b21b6 100644
--- a/cppuhelper/source/compat.cxx
+++ b/cppuhelper/source/compat.cxx
@@ -26,6 +26,8 @@ using namespace ::com::sun::star;
// Stubs for removed functionality, to be killed when we bump sal SONAME
+namespace cppu {
+
SAL_DLLPUBLIC_EXPORT
reflection::XIdlClass * SAL_CALL createStandardClassWithSequence(
const uno::Reference < lang::XMultiServiceFactory > &, const rtl::OUString &,
@@ -35,4 +37,6 @@ reflection::XIdlClass * SAL_CALL createStandardClassWithSequence(
for (;;) { std::abort(); } // avoid "must return a value" warnings
}
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */