diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-11-30 16:33:19 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-11-30 16:33:31 +0100 |
| commit | e65e90562432a8b8279a9c79a5e347aad0090e81 (patch) | |
| tree | 1e03a60cda13a928935c8f754ff8df6284a3b711 /sal | |
| parent | 299036996af6ae8897b1f2e07bbab7074955dfe8 (diff) | |
Find a more sensible place for css
Change-Id: I33fe83c47954f62d8b678430e97cf711a98568d1
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/inc/sal/types.h | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h index a6be1552f5fb..53d1645eedd1 100644 --- a/sal/inc/sal/types.h +++ b/sal/inc/sal/types.h @@ -374,20 +374,27 @@ typedef struct _sal_Sequence #define SAL_THROW_EXTERN_C() #endif - +#ifdef __cplusplus +} +#endif /* __cplusplus */ #ifdef __cplusplus + enum __sal_NoAcquire { /** definition of a no acquire enum for ctors */ SAL_NO_ACQUIRE }; -#endif /* __cplusplus */ +namespace com { namespace sun { namespace star { } } } + +/** short-circuit extra-verbose API namespaces + + @since LibreOffice 4.0 +*/ +namespace css = ::com::sun::star; -#ifdef __cplusplus -} #endif /* __cplusplus */ #ifdef __cplusplus @@ -411,14 +418,6 @@ template< typename T1, typename T2 > inline T1 static_int_cast(T2 n) { } -namespace com { namespace sun { namespace star { } } } - -/** short-circuit extra-verbose API namespaces - - @since LibreOffice 4.0 -*/ -namespace css = ::com::sun::star; - #else /* __cplusplus */ /** |