summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-01-05 13:47:38 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-01-05 13:47:54 +0100
commitdebced0f2916f7cb412e6bfcb514e3017adc7202 (patch)
treec8caf4ef5bc67b0442ed17f12d83667e59c48af6
parentce7f442bd0b600c0acc74d4757e894a2ba382c53 (diff)
These extern "C" functions are not in namespace cppu
Change-Id: Ia98b32bd8451051750fbf810958bdcfe584ea7be
-rw-r--r--cppu/source/uno/data.cxx15
1 files changed, 7 insertions, 8 deletions
diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx
index f90a41c053ca..d69bfb649a09 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: */