The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-11 00:29:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix to compile on linux (itoa is not standart please don't use it..)

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1110 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2008-11-10 19:30:16 +00:00
parent 814aa547ac
commit 145d868585
2 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Source/Plugins/Plugin_DSP_HLE/Src/Debugger/Debugger.cpp
View File

@ -22,6 +22,11 @@
// includes // includes
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
#include <sstream>
#ifndef _WIN32
#include <stdlib.h>
#endif
#include "Debugger.h" #include "Debugger.h"
#include "PBView.h" #include "PBView.h"
@ -557,11 +562,11 @@ void CDebugger::DoUpdateMail()
if(sFullMail.size() > 0 && sMailLog.size() > 0) if(sFullMail.size() > 0 && sMailLog.size() > 0)
{ {
m_log->SetValue(sFullMail.at(m_RadioBox[3]->GetSelection()).c_str()); m_log->SetValue(wxString::FromAscii(sFullMail.at(m_RadioBox[3]->GetSelection()).c_str()));
m_log->SetDefaultStyle(wxTextAttr(*wxBLUE)); // doesn't work because of the current wx m_log->SetDefaultStyle(wxTextAttr(*wxBLUE)); // doesn't work because of the current wx
m_log1->SetValue(sMailLog.at(m_RadioBox[3]->GetSelection()).c_str()); m_log1->SetValue(wxString::FromAscii(sMailLog.at(m_RadioBox[3]->GetSelection()).c_str()));
m_log1->AppendText(wxT("\n\n")); m_log1->AppendText(wxT("\n\n"));
} }
} }
@ -734,9 +739,10 @@ void CDebugger::Readfile(std::string FileName, bool GC)
//wprintf("m_RadioBox[3] enabled: %i\n", i); //wprintf("m_RadioBox[3] enabled: %i\n", i);
std::string sz = ""; std::string sz = "";
char ci[10]; itoa(i, ci, 10); std::ostringstream ci;
std::string f0 = "Logs/Mail/" + FileName + "_sep" + ci + "_sep" + "0_sep" + (GC ? "GC" : "Wii") + "_sep.log"; ci << i;
std::string f1 = "Logs/Mail/" + FileName + "_sep" + ci + "_sep" + "1_sep" + (GC ? "GC" : "Wii") + "_sep.log"; std::string f0 = "Logs/Mail/" + FileName + "_sep" + ci.str() + "_sep" + "0_sep" + (GC ? "GC" : "Wii") + "_sep.log";
std::string f1 = "Logs/Mail/" + FileName + "_sep" + ci.str() + "_sep" + "1_sep" + (GC ? "GC" : "Wii") + "_sep.log";
//wprintf("ifstream %s %s\n", f0.c_str(), f1.c_str()); //wprintf("ifstream %s %s\n", f0.c_str(), f1.c_str());

15
Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.cpp
View File

@ -18,6 +18,7 @@
#include "FileUtil.h" // for IsDirectory #include "FileUtil.h" // for IsDirectory
#include "../Debugger/Debugger.h" #include "../Debugger/Debugger.h"
#include "../Logging/Console.h" // for aprintf #include "../Logging/Console.h" // for aprintf
#include <sstream>
#ifdef _WIN32 #ifdef _WIN32
#include "../PCHW/DSoundStream.h" #include "../PCHW/DSoundStream.h"
@ -67,11 +68,14 @@ CUCode_AX::~CUCode_AX()
void CUCode_AX::SaveLogFile(std::string f, int resizeTo, bool type, bool Wii) void CUCode_AX::SaveLogFile(std::string f, int resizeTo, bool type, bool Wii)
{ {
if (!File::IsDirectory("Logs/Mail")) File::CreateDir("Logs/Mail"); if (!File::IsDirectory("Logs/Mail")) File::CreateDir("Logs/Mail");
char ci[10]; itoa(resizeTo - 1, ci, 10); // write ci std::ostringstream ci;
char cType[10]; itoa(type, cType, 10); // write cType std::ostringstream cType;
ci << (resizeTo - 1); // write ci
cType << type; // write cType
std::string FileName = "Logs/Mail/"; FileName += gpName; std::string FileName = "Logs/Mail/"; FileName += gpName;
FileName += "_sep"; FileName += ci; FileName += "_sep"; FileName += cType; FileName += "_sep"; FileName += ci.str(); FileName += "_sep"; FileName += cType.str();
FileName += Wii ? "_sepWii_sep" : "_sepGC_sep"; FileName += ".log"; FileName += Wii ? "_sepWii_sep" : "_sepGC_sep"; FileName += ".log";
FILE* fhandle = fopen(FileName.c_str(), "w"); FILE* fhandle = fopen(FileName.c_str(), "w");
@ -107,10 +111,11 @@ if(m_frame->ScanMails)
//wprintf("End"); //wprintf("End");
// Save the timestamps and comment // Save the timestamps and comment
char ci[10]; itoa(saveNext - 1, ci, 10); // write ci std::ostringstream ci;
ci << (saveNext - 1);
TmpMailLog += "\n\n"; TmpMailLog += "\n\n";
TmpMailLog += "-----------------------------------------------------------------------\n"; TmpMailLog += "-----------------------------------------------------------------------\n";
TmpMailLog += "Current mail: " + gpName + " mail " + ci + "\n\n"; TmpMailLog += "Current mail: " + gpName + " mail " + ci.str() + "\n\n";
for (int i = 0; i < sMailTime.size(); i++) for (int i = 0; i < sMailTime.size(); i++)
{ {