cppu/source/uno/data.cxx | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
New commits:
commit debced0f2916f7cb412e6bfcb514e3017adc7202
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Jan 5 13:47:38 2015 +0100
These extern "C" functions are not in namespace cppu
Change-Id: Ia98b32bd8451051750fbf810958bdcfe584ea7be
diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx
index f90a41c..d69bfb6 100644
--- a/cppu/source/uno/data.cxx
+++ b/cppu/source/uno/data.cxx
@@ -173,6 +173,8 @@ bool equalSequence(
return _equalSequence( pDest, pSource, pElementType, queryInterface,
release );
}
+}
+
extern "C"
{
@@ -318,16 +320,13 @@ sal_Bool SAL_CALL uno_type_isAssignableFromData(
_release( p, release );
return (0 != p);
}
-}
-
-
-
-
-
+}
#if OSL_DEBUG_LEVEL > 1
+namespace cppu {
+
#if defined( SAL_W32)
#pragma pack(push, 8)
#endif
@@ -591,8 +590,8 @@ BinaryCompatible_Impl::BinaryCompatible_Impl()
static BinaryCompatible_Impl aTest;
-#endif
-
}
+#endif
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
