From e99540554a619678a6f81b00635ee2d0662dde47 Mon Sep 17 00:00:00 2001 From: Gregory Hainaut Date: Fri, 1 Aug 2014 22:42:00 +0200 Subject: [PATCH] wx3.0: clang complains about support of reference in varargs --- common/include/Utilities/Console.h | 16 ++++++++-------- common/include/Utilities/StringHelpers.h | 2 +- common/include/Utilities/TraceLog.h | 6 +++--- common/src/Utilities/Console.cpp | 8 ++++---- common/src/Utilities/FastFormatString.cpp | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/common/include/Utilities/Console.h b/common/include/Utilities/Console.h index 8bff565ed8..a4fb75f686 100644 --- a/common/include/Utilities/Console.h +++ b/common/include/Utilities/Console.h @@ -122,10 +122,10 @@ struct IConsoleWriter bool Warning( const wxChar* fmt, ... ) const; #if wxMAJOR_VERSION >= 3 - bool WriteLn( ConsoleColors color, const wxString& fmt, ... ) const; - bool WriteLn( const wxString& fmt, ... ) const; - bool Error( const wxString& fmt, ... ) const; - bool Warning( const wxString& fmt, ... ) const; + bool WriteLn( ConsoleColors color, const wxString fmt, ... ) const; + bool WriteLn( const wxString fmt, ... ) const; + bool Error( const wxString fmt, ... ) const; + bool Warning( const wxString fmt, ... ) const; #endif }; @@ -164,10 +164,10 @@ struct NullConsoleWriter bool Warning( const wxChar* fmt, ... ) const { return false; } #if wxMAJOR_VERSION >= 3 - bool WriteLn( ConsoleColors color, const wxString& fmt, ... ) const { return false; } - bool WriteLn( const wxString& fmt, ... ) const { return false; } - bool Error( const wxString& fmt, ... ) const { return false; } - bool Warning( const wxString& fmt, ... ) const { return false; } + bool WriteLn( ConsoleColors color, const wxString fmt, ... ) const { return false; } + bool WriteLn( const wxString fmt, ... ) const { return false; } + bool Error( const wxString fmt, ... ) const { return false; } + bool Warning( const wxString fmt, ... ) const { return false; } #endif }; diff --git a/common/include/Utilities/StringHelpers.h b/common/include/Utilities/StringHelpers.h index b48bafb018..f3e19fb2d4 100644 --- a/common/include/Utilities/StringHelpers.h +++ b/common/include/Utilities/StringHelpers.h @@ -195,7 +195,7 @@ public: FastFormatUnicode& Write( const char* fmt, ... ); FastFormatUnicode& Write( const wxChar* fmt, ... ); #if wxMAJOR_VERSION >= 3 - FastFormatUnicode& Write( const wxString& fmt, ... ); + FastFormatUnicode& Write( const wxString fmt, ... ); #endif FastFormatUnicode& WriteV( const char* fmt, va_list argptr ); FastFormatUnicode& WriteV( const wxChar* fmt, va_list argptr ); diff --git a/common/include/Utilities/TraceLog.h b/common/include/Utilities/TraceLog.h index 9a5c948d69..d727be9b41 100644 --- a/common/include/Utilities/TraceLog.h +++ b/common/include/Utilities/TraceLog.h @@ -194,7 +194,7 @@ public: } #if wxMAJOR_VERSION >= 3 - bool Write( const wxString& fmt, ... ) const + bool Write( const wxString fmt, ... ) const { va_list list; va_start( list, fmt ); @@ -240,7 +240,7 @@ public: } #if wxMAJOR_VERSION >= 3 - bool Warn( const wxString& fmt, ... ) const + bool Warn( const wxString fmt, ... ) const { va_list list; va_start( list, fmt ); @@ -264,7 +264,7 @@ public: } #if wxMAJOR_VERSION >= 3 - bool Error( const wxString& fmt, ... ) const + bool Error( const wxString fmt, ... ) const { va_list list; va_start( list, fmt ); diff --git a/common/src/Utilities/Console.cpp b/common/src/Utilities/Console.cpp index a431a829b6..7dc36552c0 100644 --- a/common/src/Utilities/Console.cpp +++ b/common/src/Utilities/Console.cpp @@ -472,7 +472,7 @@ bool IConsoleWriter::Warning( const wxChar* fmt, ... ) const // -------------------------------------------------------------------------------------- // Write Variants - Unknown style // -------------------------------------------------------------------------------------- -bool IConsoleWriter::WriteLn( const wxString& fmt, ... ) const +bool IConsoleWriter::WriteLn( const wxString fmt, ... ) const { va_list args; va_start(args,fmt); @@ -482,7 +482,7 @@ bool IConsoleWriter::WriteLn( const wxString& fmt, ... ) const return false; } -bool IConsoleWriter::WriteLn( ConsoleColors color, const wxString& fmt, ... ) const +bool IConsoleWriter::WriteLn( ConsoleColors color, const wxString fmt, ... ) const { va_list args; va_start(args,fmt); @@ -493,7 +493,7 @@ bool IConsoleWriter::WriteLn( ConsoleColors color, const wxString& fmt, ... ) co return false; } -bool IConsoleWriter::Error( const wxString& fmt, ... ) const +bool IConsoleWriter::Error( const wxString fmt, ... ) const { va_list args; va_start(args,fmt); @@ -504,7 +504,7 @@ bool IConsoleWriter::Error( const wxString& fmt, ... ) const return false; } -bool IConsoleWriter::Warning( const wxString& fmt, ... ) const +bool IConsoleWriter::Warning( const wxString fmt, ... ) const { va_list args; va_start(args,fmt); diff --git a/common/src/Utilities/FastFormatString.cpp b/common/src/Utilities/FastFormatString.cpp index 95cccfc7ba..4b7ccd6dd2 100644 --- a/common/src/Utilities/FastFormatString.cpp +++ b/common/src/Utilities/FastFormatString.cpp @@ -296,7 +296,7 @@ FastFormatUnicode& FastFormatUnicode::Write( const wxChar* fmt, ... ) } #if wxMAJOR_VERSION >= 3 -FastFormatUnicode& FastFormatUnicode::Write( const wxString& fmt, ... ) +FastFormatUnicode& FastFormatUnicode::Write( const wxString fmt, ... ) { va_list list; va_start(list, fmt);