archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-05 06:21:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

9
Utilities/StrFmt.h
View file

@ -1,5 +1,6 @@
#pragma once #pragma once
#include <string> #include <string>
#include <vector>
#include <ostream> #include <ostream>
#include <sstream> #include <sstream>
#include <cstdio> #include <cstdio>
@ -94,14 +95,6 @@ namespace fmt{
return str; return str;
} }
//TODO:remove
//fmt alias for FormatV unused at the moment
template <typename... Args>
auto fmt(Args&&... args) -> decltype(FormatV(std::forward<Args>(parameters)...))
{
return FormatV(std::forward<Args>(args)...);
}
//convert a wxString to a std::string encoded in utf8 //convert a wxString to a std::string encoded in utf8
//CAUTION, only use this to interface with wxWidgets classes //CAUTION, only use this to interface with wxWidgets classes
std::string ToUTF8(const wxString& right); std::string ToUTF8(const wxString& right);

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

@ -1,4 +1,5 @@
#pragma once #pragma once
#include <algorithm>
#include "CPUInstrTable.h" #include "CPUInstrTable.h"
#pragma warning( disable : 4800 ) #pragma warning( disable : 4800 )
@ -321,7 +322,14 @@ public:
, m_args_count(args_count) , m_args_count(args_count)
, m_args(args_count ? new CodeFieldBase*[args_count] : nullptr) , 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 __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) 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())));
} }
} }