From da636827f1fe81045da3c33dde96fd821f8b1b01 Mon Sep 17 00:00:00 2001 From: arcum42 Date: Fri, 4 Jun 2010 23:07:46 +0000 Subject: [PATCH] Get Linux compiling again. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3159 96395faa-99c1-11dd-bbfe-3dabce05a288 --- pcsx2/DataBase_Loader.cpp | 8 +------- pcsx2/DataBase_Loader.h | 8 +++++++- pcsx2/Linux/pcsx2.cbp | 2 ++ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/pcsx2/DataBase_Loader.cpp b/pcsx2/DataBase_Loader.cpp index 1d163c3b4b..abedd6dfc5 100644 --- a/pcsx2/DataBase_Loader.cpp +++ b/pcsx2/DataBase_Loader.cpp @@ -6,13 +6,7 @@ // DataBase_Loader - Private Methods //------------------------------------------------------------------ -template string DataBase_Loader::toString(const T& value) { - stringstream ss(ios_base::in | ios_base::out); - string tString; - ss << value; - ss >> tString; - return tString; -} +//template string DataBase_Loader::toString(const T& value); string DataBase_Loader::toLower(const string& s) { string retval( s ); diff --git a/pcsx2/DataBase_Loader.h b/pcsx2/DataBase_Loader.h index 050b696670..abe622b37f 100644 --- a/pcsx2/DataBase_Loader.h +++ b/pcsx2/DataBase_Loader.h @@ -76,7 +76,13 @@ public: class DataBase_Loader { private: - template string toString(const T& value); + template string toString(const T& value) { + stringstream ss(ios_base::in | ios_base::out); + string tString; + ss << value; + ss >> tString; + return tString; + } string toLower(const string& s); bool strCompare(const string& s1, const string& s2); bool isComment(const string& s); diff --git a/pcsx2/Linux/pcsx2.cbp b/pcsx2/Linux/pcsx2.cbp index b819be8981..6408ffb916 100644 --- a/pcsx2/Linux/pcsx2.cbp +++ b/pcsx2/Linux/pcsx2.cbp @@ -204,6 +204,7 @@ + @@ -415,6 +416,7 @@ +