RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-20 22:05:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

remove dummy alias in strfmt. Fix some wxString remnants, that only make problems in Linux

Browse source
This commit is contained in:
Peter Tissen 2014-04-01 20:13:22 +02:00
parent 69352206b6
commit 373ae6b107
3 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
rpcs3/Emu/CPU/CPUDecoder.h
View file

@ -1,4 +1,5 @@
#pragma once
#include <algorithm>
#include "CPUInstrTable.h"
#pragma warning( disable : 4800 )
@ -321,7 +322,14 @@ public:
, m_args_count(args_count)
, m_args(args_count ? new CodeFieldBase*[args_count] : nullptr)
{
m_name.MakeLower().Replace("_", ".");
std::transform(
name.begin(),
name.end(),
m_name.begin(),
[](const char &a){
char b = tolower(a);
if (b == '_') b = '.';
return b; });
}
__forceinline const std::string& GetName() const

2
rpcs3/Emu/Cell/PPUProgramCompiler.cpp
View file

@ -149,7 +149,7 @@ void CompilePPUProgram::WriteError(const std::string& error)
{
if(m_err_list)
{
m_err_list->WriteText(fmt::FromUTF8(fmt::Format("line %lld: %s\n", m_line, error)));
m_err_list->WriteText(fmt::FromUTF8(fmt::Format("line %lld: %s\n", m_line, error.c_str())));
}
}