From 149940ffda25a4b5af41aca29b0583da8e0060bc Mon Sep 17 00:00:00 2001 From: Johannes Obermayr Date: Fri, 16 Jan 2015 20:57:09 +0100 Subject: [PATCH] common: gcc can't inline a couple of function => "can never be inlined because it uses variable argument lists" --- common/src/Utilities/FastFormatString.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/common/src/Utilities/FastFormatString.cpp b/common/src/Utilities/FastFormatString.cpp index 477836e262..c6b7b72934 100644 --- a/common/src/Utilities/FastFormatString.cpp +++ b/common/src/Utilities/FastFormatString.cpp @@ -150,8 +150,11 @@ public: static bool buffer_is_avail = false; static GlobalBufferManager< BaseTlsVariable< FastFormatBuffers > > m_buffer_tls(buffer_is_avail); -//static __ri void format_that_ascii_mess( SafeArray& buffer, uint writepos, const char* fmt, va_list argptr ) -static __ri void format_that_ascii_mess( CharBufferType& buffer, uint writepos, const char* fmt, va_list argptr ) +static +#ifndef __linux__ +__ri +#endif +void format_that_ascii_mess( CharBufferType& buffer, uint writepos, const char* fmt, va_list argptr ) { va_list args; while( true ) @@ -186,7 +189,11 @@ static __ri void format_that_ascii_mess( CharBufferType& buffer, uint writepos, } // returns the length of the formatted string, in characters (wxChars). -static __ri uint format_that_unicode_mess( CharBufferType& buffer, uint writepos, const wxChar* fmt, va_list argptr) +static +#ifndef __linux__ +__ri +#endif +uint format_that_unicode_mess( CharBufferType& buffer, uint writepos, const wxChar* fmt, va_list argptr) { va_list args; while( true )