mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed macos x linking problem

Browse Source
This commit is contained in:
Daniel Boelzle
2000-10-10 13:30:11 +00:00
parent 93056047ce
commit e439acf0a7
2 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cppu/inc/com/sun/star/uno/Sequence.h
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: Sequence.h,v $ * $RCSfile: Sequence.h,v $
* *
* $Revision: 1.3 $ * $Revision: 1.4 $
* *
* last change: $Author: dbo $ $Date: 2000-10-04 15:31:09 $ * last change: $Author: dbo $ $Date: 2000-10-10 14:30:11 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -124,8 +124,10 @@ public:
inline static void SAL_CALL operator delete( void *, void * ) throw() inline static void SAL_CALL operator delete( void *, void * ) throw()
{} {}
#if ! (defined(__GNUC__) && defined(__APPLE__))
// static pointer to typelib type // static pointer to typelib type
static typelib_TypeDescriptionReference * s_pType; static typelib_TypeDescriptionReference * s_pType;
#endif
/** typedefs the element type of the sequence /** typedefs the element type of the sequence
<br> <br>
@@ -269,7 +271,11 @@ inline ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL toUnoSequence(
@return type of IDL sequence @return type of IDL sequence
*/ */
template< class S > template< class S >
#if (defined(__GNUC__) && defined(__APPLE__))
inline ::com::sun::star::uno::Type
#else
inline const ::com::sun::star::uno::Type & inline const ::com::sun::star::uno::Type &
#endif
SAL_CALL getCppuType( const ::com::sun::star::uno::Sequence< S > * ); SAL_CALL getCppuType( const ::com::sun::star::uno::Sequence< S > * );
/** Gets the meta type of IDL <b>sequence< char ></b>. /** Gets the meta type of IDL <b>sequence< char ></b>.
@@ -278,7 +284,6 @@ SAL_CALL getCppuType( const ::com::sun::star::uno::Sequence< S > * );
@param dummy typed pointer for function signature @param dummy typed pointer for function signature
@return type of IDL <b>sequence< char ></b> @return type of IDL <b>sequence< char ></b>
*/ */
inline const ::com::sun::star::uno::Type & inline const ::com::sun::star::uno::Type & SAL_CALL getCharSequenceCppuType();
SAL_CALL getCharSequenceCppuType();
#endif #endif

21
cppu/inc/com/sun/star/uno/Sequence.hxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: Sequence.hxx,v $ * $RCSfile: Sequence.hxx,v $
* *
* $Revision: 1.4 $ * $Revision: 1.5 $
* *
* last change: $Author: dbo $ $Date: 2000-10-04 15:31:09 $ * last change: $Author: dbo $ $Date: 2000-10-10 14:30:11 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -97,9 +97,11 @@ namespace star
/** */ //for docpp /** */ //for docpp
namespace uno namespace uno
{ {
#if ! (defined(__GNUC__) && defined(__APPLE__))
//__________________________________________________________________________________________________ //__________________________________________________________________________________________________
template< class E > template< class E >
typelib_TypeDescriptionReference * Sequence< E >::s_pType = 0; typelib_TypeDescriptionReference * Sequence< E >::s_pType = 0;
#endif
//__________________________________________________________________________________________________ //__________________________________________________________________________________________________
template< class E > template< class E >
@@ -203,6 +205,17 @@ inline ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL toUnoSequence(
// generic sequence template // generic sequence template
template< class S > template< class S >
#if (defined(__GNUC__) && defined(__APPLE__))
inline ::com::sun::star::uno::Type
SAL_CALL getCppuType( const ::com::sun::star::uno::Sequence< S > * )
{
typelib_TypeDescriptionReference * pType = 0;
const ::com::sun::star::uno::Type & rElementType = ::getCppuType(
(::com::sun::star::uno::Sequence< S >::ElementType *)0 );
::typelib_static_sequence_type_init( &pType, rElementType.getTypeLibType() );
return ::com::sun::star::uno::Type( pType );
}
#else
inline const ::com::sun::star::uno::Type & inline const ::com::sun::star::uno::Type &
SAL_CALL getCppuType( const ::com::sun::star::uno::Sequence< S > * ) SAL_CALL getCppuType( const ::com::sun::star::uno::Sequence< S > * )
{ {
@@ -217,14 +230,14 @@ SAL_CALL getCppuType( const ::com::sun::star::uno::Sequence< S > * )
return * reinterpret_cast< const ::com::sun::star::uno::Type * >( return * reinterpret_cast< const ::com::sun::star::uno::Type * >(
& ::com::sun::star::uno::Sequence< S >::s_pType ); & ::com::sun::star::uno::Sequence< S >::s_pType );
} }
#endif
#if ((defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)) || (defined(__GNUC__) && defined(__APPLE__))) #if ((defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)) || (defined(__GNUC__) && defined(__APPLE__)))
static typelib_TypeDescriptionReference * s_pType_com_sun_star_uno_Sequence_Char = 0; static typelib_TypeDescriptionReference * s_pType_com_sun_star_uno_Sequence_Char = 0;
#endif #endif
// char sequence // char sequence
inline const ::com::sun::star::uno::Type & inline const ::com::sun::star::uno::Type & SAL_CALL getCharSequenceCppuType()
SAL_CALL getCharSequenceCppuType()
{ {
#if !( (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)) || (defined(__GNUC__) && defined(__APPLE__)) ) #if !( (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)) || (defined(__GNUC__) && defined(__APPLE__)) )
static typelib_TypeDescriptionReference * s_pType_com_sun_star_uno_Sequence_Char = 0; static typelib_TypeDescriptionReference * s_pType_com_sun_star_uno_Sequence_Char = 0;