[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - cppuhelper/source

[Stephan Bergmann]

 cppuhelper/source/compat.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 54f7c0ae8bd65100fa1fa6e574ed39247a8090dc
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Oct 1 00:07:23 2013 +0200

    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 at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/cppuhelper/source/compat.cxx b/cppuhelper/source/compat.cxx
index c24a8a8..8d13116 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: */