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

[Stephan Bergmann]

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

New commits:
commit 6f089d61c8576f271b2873b532170a6bd627c9e2
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
    
    Change-Id: I30dde10d1c299dbd9c0b2cb2fa025ce432df6cce
    (cherry picked from commit 69f1846f4095a9dc607a0e568980d8625d657c94)
    Reviewed-on: https://gerrit.libreoffice.org/6097
    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 ab57a2a..3047c11 100644
--- a/cppuhelper/source/compat.cxx
+++ b/cppuhelper/source/compat.cxx
@@ -48,8 +48,6 @@ css::uno::Reference< css::lang::XMultiComponentFactory > bootstrapInitialSF(
     for (;;) { std::abort(); } // avoid "must return a value" warnings
 }
 
-}
-
 SAL_DLLPUBLIC_EXPORT css::uno::Reference< css::uno::XComponentContext > SAL_CALL
 bootstrap_InitialComponentContext(
     css::uno::Reference< css::registry::XSimpleRegistry > const &,
@@ -86,4 +84,6 @@ createStandardClassWithSequence(
     for (;;) { std::abort(); } // avoid "must return a value" warnings
 }
 
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */