diff options
| author | Stephan Bergmann <sb@openoffice.org> | 2002-11-05 09:47:49 +0000 |
|---|---|---|
| committer | Stephan Bergmann <sb@openoffice.org> | 2002-11-05 09:47:49 +0000 |
| commit | de738294dc040136f37f4552ffd6d05deadce0a7 (patch) | |
| tree | 3415bdb1f60901748c126ff186f17efd7dd627f6 | |
| parent | 80640f534230a2a1a19c8c27b8016b40a05220b5 (diff) | |
#103888# Fixes for Solaris compiler.
| -rw-r--r-- | sal/rtl/source/math.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sal/rtl/source/math.cxx b/sal/rtl/source/math.cxx index 3ed14f72c..8a32dc774 100644 --- a/sal/rtl/source/math.cxx +++ b/sal/rtl/source/math.cxx @@ -2,9 +2,9 @@ * * $RCSfile: math.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: sb $ $Date: 2002-11-04 15:25:01 $ + * last change: $Author: sb $ $Date: 2002-11-05 10:47:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -175,8 +175,10 @@ struct UStringTraits #pragma optimize("g",off) #endif // WIN, MSC, WNT -template< typename T > -inline void doubleToString(typename T::String ** pResult, +// Solaris C++ 5.2 compiler has problems when "StringT ** pResult" is +// "typename T::String ** pResult" instead: +template< typename T, typename StringT > +inline void doubleToString(StringT ** pResult, sal_Int32 * pResultCapacity, sal_Int32 nResultOffset, double fValue, rtl_math_StringFormat eFormat, sal_Int32 nDecPlaces, typename T::Char cDecSeparator, @@ -531,10 +533,9 @@ void SAL_CALL rtl_math_doubleToString(rtl_String ** pResult, sal_Bool bEraseTrailingDecZeros) SAL_THROW_EXTERN_C() { - doubleToString< StringTraits >(pResult, pResultCapacity, nResultOffset, - fValue, eFormat, nDecPlaces, cDecSeparator, - pGroups, cGroupSeparator, - bEraseTrailingDecZeros); + doubleToString< StringTraits, StringTraits::String >( + pResult, pResultCapacity, nResultOffset, fValue, eFormat, nDecPlaces, + cDecSeparator, pGroups, cGroupSeparator, bEraseTrailingDecZeros); } void SAL_CALL rtl_math_doubleToUString(rtl_uString ** pResult, @@ -548,15 +549,14 @@ void SAL_CALL rtl_math_doubleToUString(rtl_uString ** pResult, sal_Bool bEraseTrailingDecZeros) SAL_THROW_EXTERN_C() { - doubleToString< UStringTraits >(pResult, pResultCapacity, nResultOffset, - fValue, eFormat, nDecPlaces, cDecSeparator, - pGroups, cGroupSeparator, - bEraseTrailingDecZeros); + doubleToString< UStringTraits, UStringTraits::String >( + pResult, pResultCapacity, nResultOffset, fValue, eFormat, nDecPlaces, + cDecSeparator, pGroups, cGroupSeparator, bEraseTrailingDecZeros); } #if defined WIN || (defined MSC && defined WNT) #pragma optimize("",on) -#endif +#endif // WIN, MSC, WNT namespace { |