From 874da27599cac2d29ea6f0be4b0f56a88c5caf91 Mon Sep 17 00:00:00 2001 From: lioncash Date: Mon, 24 Mar 2014 08:40:35 -0400 Subject: [PATCH] Initialize strings through the initializer list in PPUProgramCompiler.h --- rpcs3/Emu/Cell/PPUProgramCompiler.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/rpcs3/Emu/Cell/PPUProgramCompiler.h b/rpcs3/Emu/Cell/PPUProgramCompiler.h index 70b16ee58f..857965b95f 100644 --- a/rpcs3/Emu/Cell/PPUProgramCompiler.h +++ b/rpcs3/Emu/Cell/PPUProgramCompiler.h @@ -24,10 +24,10 @@ struct Arg ArgType type; Arg(const wxString& _string, const u32 _value = 0, const ArgType _type = ARG_ERR) - : value(_value) + : string(_string.ToStdString()) + , value(_value) , type(_type) { - string = _string.ToStdString(); } }; @@ -68,19 +68,19 @@ class CompilePPUProgram s32 m_addr; Branch(const wxString& name, s32 pos) - : m_pos(pos) + : m_name(name.ToStdString()) + , m_pos(pos) , m_id(-1) , m_addr(-1) { - m_name = name.ToStdString(); } Branch(const wxString& name, u32 id, u32 addr) - : m_pos(-1) + : m_name(name.ToStdString()) + , m_pos(-1) , m_id(id) , m_addr(addr) { - m_name = name.ToStdString(); } }; @@ -105,9 +105,9 @@ class CompilePPUProgram u32 m_addr; SpData(const wxString& data, u32 addr) - : m_addr(addr) + : m_data(data.ToStdString()) + , m_addr(addr) { - m_data = data.ToStdString(); } };