Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-20 17:41:13 +02:00
Code Issues Releases Wiki Activity

Try again to fix TranslatableString for Windows compiler...

Browse Source 
... The fix at a3d8518 was not sufficient.

I think the Windows compiler has a bug, and gets confused by a name that has
static and non-static overloads.  So use distinct names instead.
This commit is contained in:
Paul Licameli
2019-12-14 14:17:34 -05:00
parent a19035429c
commit 8aa6b47b17
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/audacity/Types.h
View File

@@ -393,7 +393,7 @@ public:
default: { default: {
bool debug = request == Request::DebugFormat; bool debug = request == Request::DebugFormat;
return wxString::Format( return wxString::Format(
TranslatableString::DoFormat( prevFormatter, str, debug ), TranslatableString::DoSubstitute( prevFormatter, str, debug ),
TranslatableString::TranslateArgument( args, debug )... TranslatableString::TranslateArgument( args, debug )...
); );
} }
@@ -466,10 +466,10 @@ private:
friend std::hash< TranslatableString >; friend std::hash< TranslatableString >;
static wxString DoGetContext( const Formatter &formatter ); static wxString DoGetContext( const Formatter &formatter );
static wxString DoFormat( static wxString DoSubstitute(
const Formatter &formatter, const wxString &format, bool debug ); const Formatter &formatter, const wxString &format, bool debug );
wxString DoFormat( bool debug ) const wxString DoFormat( bool debug ) const
{ return DoFormat( mFormatter, *this, debug ); } { return DoSubstitute( mFormatter, *this, debug ); }
static wxString DoChooseFormat( static wxString DoChooseFormat(
const Formatter &formatter, const Formatter &formatter,

4
src/Internat.cpp
View File

@@ -317,7 +317,7 @@ wxString TranslatableString::DoGetContext( const Formatter &formatter )
return formatter ? formatter( {}, Request::Context ) : wxString{}; return formatter ? formatter( {}, Request::Context ) : wxString{};
} }
wxString TranslatableString::DoFormat( wxString TranslatableString::DoSubstitute(
const Formatter &formatter, const wxString &format, bool debug ) const Formatter &formatter, const wxString &format, bool debug )
{ {
return formatter return formatter
@@ -362,7 +362,7 @@ TranslatableString &TranslatableString::Join(
default: { default: {
bool debug = request == Request::DebugFormat; bool debug = request == Request::DebugFormat;
return return
TranslatableString::DoFormat( prevFormatter, str, debug ) TranslatableString::DoSubstitute( prevFormatter, str, debug )
+ separator + separator
+ arg.DoFormat( debug ); + arg.DoFormat( debug );
} }