Skip to content

C
core
Kaydet (Commit) ab740f43 authored tarafından Tor Lillqvist's avatar Tor Lillqvist
Dosyalara gözat
Seçenekler

'internal' is a keyword in current C++/CLI 

Using it as a namespace in our rtl string headers breaks compilation
of cli_ure/source/climaker/climaker_emit.cxx (and other C++/CLI
sources we might have that include rtl string headers). Rename it to
'libreoffice_internal'.

Change-Id: Ieae68bd612b05d326d570945c1d08a54bf011852
üst e9cd74ad
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 47 deletions
include/rtl/strbuf.hxx
Dosyayı görüntüle @ ab740f43
...@@ -157,7 +157,7 @@ public: ...@@ -157,7 +157,7 @@ public:
@since LibreOffice 3.6 @since LibreOffice 3.6
*/ */
template< typename T > template< typename T >
OStringBuffer( const T& value, typename internal::CharPtrDetector< T, internal::Dummy >::Type = internal::Dummy()) OStringBuffer( const T& value, typename libreoffice_internal::CharPtrDetector< T, libreoffice_internal::Dummy >::Type = libreoffice_internal::Dummy())
: pData(NULL) : pData(NULL)
{ {
sal_Int32 length = rtl_str_getLength( value ); sal_Int32 length = rtl_str_getLength( value );
...@@ -166,7 +166,7 @@ public: ...@@ -166,7 +166,7 @@ public:
} }
template< typename T > template< typename T >
OStringBuffer( T& value, typename internal::NonConstCharArrayDetector< T, internal::Dummy >::Type = internal::Dummy()) OStringBuffer( T& value, typename libreoffice_internal::NonConstCharArrayDetector< T, libreoffice_internal::Dummy >::Type = libreoffice_internal::Dummy())
: pData(NULL) : pData(NULL)
{ {
sal_Int32 length = rtl_str_getLength( value ); sal_Int32 length = rtl_str_getLength( value );
...@@ -186,12 +186,12 @@ public: ...@@ -186,12 +186,12 @@ public:
@param literal a string literal @param literal a string literal
*/ */
template< typename T > template< typename T >
OStringBuffer( T& literal, typename internal::ConstCharArrayDetector< T, internal::Dummy >::Type = internal::Dummy()) OStringBuffer( T& literal, typename libreoffice_internal::ConstCharArrayDetector< T, libreoffice_internal::Dummy >::Type = libreoffice_internal::Dummy())
: pData(NULL) : pData(NULL)
, nCapacity( internal::ConstCharArrayDetector< T, void >::size - 1 + 16 ) , nCapacity( libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 + 16 )
{ {
assert( strlen( literal ) == internal::ConstCharArrayDetector< T >::size - 1 ); assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 );
rtl_string_newFromLiteral( &pData, literal, internal::ConstCharArrayDetector< T, void >::size - 1, 16 ); rtl_string_newFromLiteral( &pData, literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1, 16 );
#ifdef RTL_STRING_UNITTEST #ifdef RTL_STRING_UNITTEST
rtl_string_unittest_const_literal = true; rtl_string_unittest_const_literal = true;
#endif #endif
...@@ -451,13 +451,13 @@ public: ...@@ -451,13 +451,13 @@ public:
@return this string buffer. @return this string buffer.
*/ */
template< typename T > template< typename T >
typename internal::CharPtrDetector< T, OStringBuffer& >::Type append( const T& str ) typename libreoffice_internal::CharPtrDetector< T, OStringBuffer& >::Type append( const T& str )
{ {
return append( str, rtl_str_getLength( str ) ); return append( str, rtl_str_getLength( str ) );
} }
template< typename T > template< typename T >
typename internal::NonConstCharArrayDetector< T, OStringBuffer& >::Type append( T& str ) typename libreoffice_internal::NonConstCharArrayDetector< T, OStringBuffer& >::Type append( T& str )
{ {
return append( str, rtl_str_getLength( str ) ); return append( str, rtl_str_getLength( str ) );
} }
...@@ -468,11 +468,11 @@ public: ...@@ -468,11 +468,11 @@ public:
@since LibreOffice 3.6 @since LibreOffice 3.6
*/ */
template< typename T > template< typename T >
typename internal::ConstCharArrayDetector< T, OStringBuffer& >::Type append( T& literal ) typename libreoffice_internal::ConstCharArrayDetector< T, OStringBuffer& >::Type append( T& literal )
{ {
RTL_STRING_CONST_FUNCTION RTL_STRING_CONST_FUNCTION
assert( strlen( literal ) == internal::ConstCharArrayDetector< T >::size - 1 ); assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 );
rtl_stringbuffer_insert( &pData, &nCapacity, getLength(), literal, internal::ConstCharArrayDetector< T, void >::size - 1 ); rtl_stringbuffer_insert( &pData, &nCapacity, getLength(), literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 );
return *this; return *this;
} }
...@@ -556,8 +556,8 @@ public: ...@@ -556,8 +556,8 @@ public:
// Explicitly delete all pointer append() overloads to prevent this // Explicitly delete all pointer append() overloads to prevent this
// (except for char* overload, which is handled elsewhere). // (except for char* overload, which is handled elsewhere).
template< typename T > template< typename T >
typename internal::Enable< void, typename libreoffice_internal::Enable< void,
!internal::CharPtrDetector< T* >::ok >::Type !libreoffice_internal::CharPtrDetector< T* >::ok >::Type
append( T* ) SAL_DELETED_FUNCTION; append( T* ) SAL_DELETED_FUNCTION;
/// @endcond /// @endcond
...@@ -684,13 +684,13 @@ public: ...@@ -684,13 +684,13 @@ public:
@return this string buffer. @return this string buffer.
*/ */
template< typename T > template< typename T >
typename internal::CharPtrDetector< T, OStringBuffer& >::Type insert( sal_Int32 offset, const T& str ) typename libreoffice_internal::CharPtrDetector< T, OStringBuffer& >::Type insert( sal_Int32 offset, const T& str )
{ {
return insert( offset, str, rtl_str_getLength( str ) ); return insert( offset, str, rtl_str_getLength( str ) );
} }
template< typename T > template< typename T >
typename internal::NonConstCharArrayDetector< T, OStringBuffer& >::Type insert( sal_Int32 offset, T& str ) typename libreoffice_internal::NonConstCharArrayDetector< T, OStringBuffer& >::Type insert( sal_Int32 offset, T& str )
{ {
return insert( offset, str, rtl_str_getLength( str ) ); return insert( offset, str, rtl_str_getLength( str ) );
} }
...@@ -701,11 +701,11 @@ public: ...@@ -701,11 +701,11 @@ public:
@since LibreOffice 3.6 @since LibreOffice 3.6
*/ */
template< typename T > template< typename T >
typename internal::ConstCharArrayDetector< T, OStringBuffer& >::Type insert( sal_Int32 offset, T& literal ) typename libreoffice_internal::ConstCharArrayDetector< T, OStringBuffer& >::Type insert( sal_Int32 offset, T& literal )
{ {
RTL_STRING_CONST_FUNCTION RTL_STRING_CONST_FUNCTION
assert( strlen( literal ) == internal::ConstCharArrayDetector< T >::size - 1 ); assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 );
rtl_stringbuffer_insert( &pData, &nCapacity, offset, literal, internal::ConstCharArrayDetector< T, void >::size - 1 ); rtl_stringbuffer_insert( &pData, &nCapacity, offset, literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 );
return *this; return *this;
} }
......
include/rtl/string.hxx
Dosyayı görüntüle @ ab740f43
This diff is collapsed.
include/rtl/stringconcat.hxx
Dosyayı görüntüle @ ab740f43
...@@ -201,7 +201,7 @@ struct ToStringHelper< OUStringConcat< T1, T2 > > ...@@ -201,7 +201,7 @@ struct ToStringHelper< OUStringConcat< T1, T2 > >
template< typename T1, typename T2 > template< typename T1, typename T2 >
inline inline
SAL_WARN_UNUSED_RESULT SAL_WARN_UNUSED_RESULT
typename internal::Enable< OStringConcat< T1, T2 >, ToStringHelper< T1 >::allowOStringConcat && ToStringHelper< T2 >::allowOStringConcat >::Type operator+( const T1& left, const T2& right ) typename libreoffice_internal::Enable< OStringConcat< T1, T2 >, ToStringHelper< T1 >::allowOStringConcat && ToStringHelper< T2 >::allowOStringConcat >::Type operator+( const T1& left, const T2& right )
{ {
return OStringConcat< T1, T2 >( left, right ); return OStringConcat< T1, T2 >( left, right );
} }
...@@ -210,7 +210,7 @@ typename internal::Enable< OStringConcat< T1, T2 >, ToStringHelper< T1 >::allowO ...@@ -210,7 +210,7 @@ typename internal::Enable< OStringConcat< T1, T2 >, ToStringHelper< T1 >::allowO
template< typename T, int N > template< typename T, int N >
inline inline
SAL_WARN_UNUSED_RESULT SAL_WARN_UNUSED_RESULT
typename internal::Enable< OStringConcat< T, const char[ N ] >, ToStringHelper< T >::allowOStringConcat >::Type operator+( const T& left, const char (&right)[ N ] ) typename libreoffice_internal::Enable< OStringConcat< T, const char[ N ] >, ToStringHelper< T >::allowOStringConcat >::Type operator+( const T& left, const char (&right)[ N ] )
{ {
return OStringConcat< T, const char[ N ] >( left, right ); return OStringConcat< T, const char[ N ] >( left, right );
} }
...@@ -218,7 +218,7 @@ typename internal::Enable< OStringConcat< T, const char[ N ] >, ToStringHelper< ...@@ -218,7 +218,7 @@ typename internal::Enable< OStringConcat< T, const char[ N ] >, ToStringHelper<
template< typename T, int N > template< typename T, int N >
inline inline
SAL_WARN_UNUSED_RESULT SAL_WARN_UNUSED_RESULT
typename internal::Enable< OStringConcat< const char[ N ], T >, ToStringHelper< T >::allowOStringConcat >::Type operator+( const char (&left)[ N ], const T& right ) typename libreoffice_internal::Enable< OStringConcat< const char[ N ], T >, ToStringHelper< T >::allowOStringConcat >::Type operator+( const char (&left)[ N ], const T& right )
{ {
return OStringConcat< const char[ N ], T >( left, right ); return OStringConcat< const char[ N ], T >( left, right );
} }
...@@ -226,7 +226,7 @@ typename internal::Enable< OStringConcat< const char[ N ], T >, ToStringHelper< ...@@ -226,7 +226,7 @@ typename internal::Enable< OStringConcat< const char[ N ], T >, ToStringHelper<
template< typename T, int N > template< typename T, int N >
inline inline
SAL_WARN_UNUSED_RESULT SAL_WARN_UNUSED_RESULT
typename internal::Enable< OStringConcat< T, char[ N ] >, ToStringHelper< T >::allowOStringConcat >::Type operator+( const T& left, char (&right)[ N ] ) typename libreoffice_internal::Enable< OStringConcat< T, char[ N ] >, ToStringHelper< T >::allowOStringConcat >::Type operator+( const T& left, char (&right)[ N ] )
{ {
return OStringConcat< T, char[ N ] >( left, right ); return OStringConcat< T, char[ N ] >( left, right );
} }
...@@ -234,28 +234,28 @@ typename internal::Enable< OStringConcat< T, char[ N ] >, ToStringHelper< T >::a ...@@ -234,28 +234,28 @@ typename internal::Enable< OStringConcat< T, char[ N ] >, ToStringHelper< T >::a
template< typename T, int N > template< typename T, int N >
inline inline
SAL_WARN_UNUSED_RESULT SAL_WARN_UNUSED_RESULT
typename internal::Enable< OStringConcat< char[ N ], T >, ToStringHelper< T >::allowOStringConcat >::Type operator+( char (&left)[ N ], const T& right ) typename libreoffice_internal::Enable< OStringConcat< char[ N ], T >, ToStringHelper< T >::allowOStringConcat >::Type operator+( char (&left)[ N ], const T& right )
{ {
return OStringConcat< char[ N ], T >( left, right ); return OStringConcat< char[ N ], T >( left, right );
} }
template< typename T1, typename T2 > template< typename T1, typename T2 >
inline inline
typename internal::Enable< OUStringConcat< T1, T2 >, ToStringHelper< T1 >::allowOUStringConcat && ToStringHelper< T2 >::allowOUStringConcat >::Type operator+( const T1& left, const T2& right ) typename libreoffice_internal::Enable< OUStringConcat< T1, T2 >, ToStringHelper< T1 >::allowOUStringConcat && ToStringHelper< T2 >::allowOUStringConcat >::Type operator+( const T1& left, const T2& right )
{ {
return OUStringConcat< T1, T2 >( left, right ); return OUStringConcat< T1, T2 >( left, right );
} }
template< typename T1, typename T2 > template< typename T1, typename T2 >
inline inline
typename internal::Enable< OUStringConcat< T1, T2 >, ToStringHelper< T1 >::allowOUStringConcat && ToStringHelper< T2 >::allowOUStringConcat && internal::ConstCharArrayDetector< T1, void >::ok >::Type operator+( T1& left, const T2& right ) typename libreoffice_internal::Enable< OUStringConcat< T1, T2 >, ToStringHelper< T1 >::allowOUStringConcat && ToStringHelper< T2 >::allowOUStringConcat && libreoffice_internal::ConstCharArrayDetector< T1, void >::ok >::Type operator+( T1& left, const T2& right )
{ {
return OUStringConcat< T1, T2 >( left, right ); return OUStringConcat< T1, T2 >( left, right );
} }
template< typename T1, typename T2 > template< typename T1, typename T2 >
inline inline
typename internal::Enable< OUStringConcat< T1, T2 >, ToStringHelper< T1 >::allowOUStringConcat && ToStringHelper< T2 >::allowOUStringConcat && internal::ConstCharArrayDetector< T2, void >::ok >::Type operator+( const T1& left, T2& right ) typename libreoffice_internal::Enable< OUStringConcat< T1, T2 >, ToStringHelper< T1 >::allowOUStringConcat && ToStringHelper< T2 >::allowOUStringConcat && libreoffice_internal::ConstCharArrayDetector< T2, void >::ok >::Type operator+( const T1& left, T2& right )
{ {
return OUStringConcat< T1, T2 >( left, right ); return OUStringConcat< T1, T2 >( left, right );
} }
......
include/rtl/stringutils.hxx
Dosyayı görüntüle @ ab740f43
...@@ -38,7 +38,7 @@ namespace rtl ...@@ -38,7 +38,7 @@ namespace rtl
#undef rtl #undef rtl
#endif #endif
namespace internal namespace libreoffice_internal
{ {
/* /*
These templates use SFINAE (Substitution failure is not an error) to help distinguish the various These templates use SFINAE (Substitution failure is not an error) to help distinguish the various
......
include/rtl/ustrbuf.hxx
Dosyayı görüntüle @ ab740f43
...@@ -147,12 +147,12 @@ public: ...@@ -147,12 +147,12 @@ public:
} }
template< typename T > template< typename T >
OUStringBuffer( T& literal, typename internal::ConstCharArrayDetector< T, internal::Dummy >::Type = internal::Dummy() ) OUStringBuffer( T& literal, typename libreoffice_internal::ConstCharArrayDetector< T, libreoffice_internal::Dummy >::Type = libreoffice_internal::Dummy() )
: pData(NULL) : pData(NULL)
, nCapacity( internal::ConstCharArrayDetector< T, void >::size - 1 + 16 ) , nCapacity( libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 + 16 )
{ {
assert( strlen( literal ) == internal::ConstCharArrayDetector< T >::size - 1 ); assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 );
rtl_uString_newFromLiteral( &pData, literal, internal::ConstCharArrayDetector< T, void >::size - 1, 16 ); rtl_uString_newFromLiteral( &pData, literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1, 16 );
#ifdef RTL_STRING_UNITTEST #ifdef RTL_STRING_UNITTEST
rtl_string_unittest_const_literal = true; rtl_string_unittest_const_literal = true;
#endif #endif
...@@ -164,7 +164,7 @@ public: ...@@ -164,7 +164,7 @@ public:
* @internal * @internal
*/ */
template< typename T > template< typename T >
OUStringBuffer( T&, typename internal::ExceptConstCharArrayDetector< T >::Type = internal::Dummy() ) OUStringBuffer( T&, typename libreoffice_internal::ExceptConstCharArrayDetector< T >::Type = libreoffice_internal::Dummy() )
{ {
pData = 0; pData = 0;
nCapacity = 10; nCapacity = 10;
...@@ -176,7 +176,7 @@ public: ...@@ -176,7 +176,7 @@ public:
* @internal * @internal
*/ */
template< typename T > template< typename T >
OUStringBuffer( const T&, typename internal::ExceptCharArrayDetector< T >::Type = internal::Dummy() ) OUStringBuffer( const T&, typename libreoffice_internal::ExceptCharArrayDetector< T >::Type = libreoffice_internal::Dummy() )
{ {
pData = 0; pData = 0;
nCapacity = 10; nCapacity = 10;
...@@ -485,11 +485,11 @@ public: ...@@ -485,11 +485,11 @@ public:
@since LibreOffice 3.6 @since LibreOffice 3.6
*/ */
template< typename T > template< typename T >
typename internal::ConstCharArrayDetector< T, OUStringBuffer& >::Type append( T& literal ) typename libreoffice_internal::ConstCharArrayDetector< T, OUStringBuffer& >::Type append( T& literal )
{ {
assert( strlen( literal ) == internal::ConstCharArrayDetector< T >::size - 1 ); assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 );
rtl_uStringbuffer_insert_ascii( &pData, &nCapacity, getLength(), literal, rtl_uStringbuffer_insert_ascii( &pData, &nCapacity, getLength(), literal,
internal::ConstCharArrayDetector< T, void >::size - 1 ); libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 );
return *this; return *this;
} }
...@@ -581,8 +581,8 @@ public: ...@@ -581,8 +581,8 @@ public:
// Explicitly delete all pointer append() overloads to prevent this // Explicitly delete all pointer append() overloads to prevent this
// (except for char* and sal_Unicode* overloads, which are handled elsewhere). // (except for char* and sal_Unicode* overloads, which are handled elsewhere).
template< typename T > template< typename T >
typename internal::Enable< void, typename libreoffice_internal::Enable< void,
!internal::CharPtrDetector< T* >::ok && !internal::SalUnicodePtrDetector< T* >::ok >::Type !libreoffice_internal::CharPtrDetector< T* >::ok && !libreoffice_internal::SalUnicodePtrDetector< T* >::ok >::Type
append( T* ) SAL_DELETED_FUNCTION; append( T* ) SAL_DELETED_FUNCTION;
/// @endcond /// @endcond
...@@ -806,11 +806,11 @@ public: ...@@ -806,11 +806,11 @@ public:
@since LibreOffice 3.6 @since LibreOffice 3.6
*/ */
template< typename T > template< typename T >
typename internal::ConstCharArrayDetector< T, OUStringBuffer& >::Type insert( sal_Int32 offset, T& literal ) typename libreoffice_internal::ConstCharArrayDetector< T, OUStringBuffer& >::Type insert( sal_Int32 offset, T& literal )
{ {
assert( strlen( literal ) == internal::ConstCharArrayDetector< T >::size - 1 ); assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 );
rtl_uStringbuffer_insert_ascii( &pData, &nCapacity, offset, literal, rtl_uStringbuffer_insert_ascii( &pData, &nCapacity, offset, literal,
internal::ConstCharArrayDetector< T, void >::size - 1 ); libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 );
return *this; return *this;
} }
...@@ -1189,12 +1189,12 @@ public: ...@@ -1189,12 +1189,12 @@ public:
@since LibreOffice 4.0 @since LibreOffice 4.0
*/ */
template< typename T > template< typename T >
typename internal::ConstCharArrayDetector< T, sal_Int32 >::Type indexOf( T& literal, sal_Int32 fromIndex = 0 ) const typename libreoffice_internal::ConstCharArrayDetector< T, sal_Int32 >::Type indexOf( T& literal, sal_Int32 fromIndex = 0 ) const
{ {
assert( strlen( literal ) == internal::ConstCharArrayDetector< T >::size - 1 ); assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 );
sal_Int32 ret = rtl_ustr_indexOfAscii_WithLength( sal_Int32 ret = rtl_ustr_indexOfAscii_WithLength(
pData->buffer + fromIndex, pData->length - fromIndex, literal, pData->buffer + fromIndex, pData->length - fromIndex, literal,
internal::ConstCharArrayDetector< T, void >::size - 1); libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1);
return ret < 0 ? ret : ret + fromIndex; return ret < 0 ? ret : ret + fromIndex;
} }
...@@ -1252,11 +1252,11 @@ public: ...@@ -1252,11 +1252,11 @@ public:
@since LibreOffice 4.0 @since LibreOffice 4.0
*/ */
template< typename T > template< typename T >
typename internal::ConstCharArrayDetector< T, sal_Int32 >::Type lastIndexOf( T& literal ) const typename libreoffice_internal::ConstCharArrayDetector< T, sal_Int32 >::Type lastIndexOf( T& literal ) const
{ {
assert( strlen( literal ) == internal::ConstCharArrayDetector< T >::size - 1 ); assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 );
return rtl_ustr_lastIndexOfAscii_WithLength( return rtl_ustr_lastIndexOfAscii_WithLength(
pData->buffer, pData->length, literal, internal::ConstCharArrayDetector< T, void >::size - 1); pData->buffer, pData->length, literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1);
} }
/** /**
......
include/rtl/ustring.hxx
Dosyayı görüntüle @ ab740f43
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment