From fc51789ad0eafc41460e67773d11609d366fc4b7 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 7 Feb 2017 23:06:45 +0100 Subject: Solaris C++ 5.2 compiler is no longer relevant Change-Id: I520a58438e156661d3e01a899e97ee33d9f19102 --- sal/rtl/math.cxx | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx index 95df8205db65..4d0ecb199b61 100644 --- a/sal/rtl/math.cxx +++ b/sal/rtl/math.cxx @@ -171,10 +171,8 @@ bool isRepresentableInteger(double fAbsValue) return false; } -// 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, +template< typename T > +inline void doubleToString(typename T::String ** pResult, sal_Int32 * pResultCapacity, sal_Int32 nResultOffset, double fValue, rtl_math_StringFormat eFormat, sal_Int32 nDecPlaces, typename T::Char cDecSeparator, @@ -628,7 +626,7 @@ void SAL_CALL rtl_math_doubleToString(rtl_String ** pResult, sal_Bool bEraseTrailingDecZeros) SAL_THROW_EXTERN_C() { - doubleToString< StringTraits, StringTraits::String >( + doubleToString< StringTraits >( pResult, pResultCapacity, nResultOffset, fValue, eFormat, nDecPlaces, cDecSeparator, pGroups, cGroupSeparator, bEraseTrailingDecZeros); } @@ -644,7 +642,7 @@ void SAL_CALL rtl_math_doubleToUString(rtl_uString ** pResult, sal_Bool bEraseTrailingDecZeros) SAL_THROW_EXTERN_C() { - doubleToString< UStringTraits, UStringTraits::String >( + doubleToString< UStringTraits >( pResult, pResultCapacity, nResultOffset, fValue, eFormat, nDecPlaces, cDecSeparator, pGroups, cGroupSeparator, bEraseTrailingDecZeros); } -- cgit