mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-17 08:11:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert some changes until GCC 4.9 is available.

Browse Source
This commit is contained in:
Sacha 2014-07-10 05:16:17 +10:00
parent 0299ab7660
commit 711f9eadc5
2 changed files with 53 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.travis.yml
View File

@ -8,6 +8,9 @@ branches:
only:
- master
git:
submodules: false
before_install:
- echo "yes" | sudo apt-key adv --fetch-keys http://repos.codelite.org/CodeLite.asc
- echo "yes" | sudo apt-add-repository 'deb http://repos.codelite.org/wx3.0/ubuntu/ precise universe'
@ -25,11 +28,11 @@ before_install:
sudo ./cmake-2.8.12.1-Linux-i386.sh --skip-license --prefix=/usr;
before_script:
- git submodule update --init --recursive
- git submodule update --init asmjit ffmpeg
- mkdir build
- cd build
- cmake ..
script:
- make
- make -j 4

58
rpcs3/Ini.cpp
View File

@ -47,14 +47,33 @@ static inline std::string BoolToString(const bool b)
static std::pair<int, int> StringToSize(const std::string& str)
{
std::pair<int, int> ret;
#if 1
std::string s[2] = { "", "" };
for (uint i = 0, a = 0; i<str.size(); ++i)
{
if (!fmt::CmpNoCase(str.substr(i, 1), "x"))
{
if (++a >= 2) return rDefaultSize;
continue;
}
s[a] += str.substr(i, 1);
}
if (s[0].empty() || s[1].empty())
#else
// Requires GCC 4.9 or new stdlib for Clang
std::sregex_token_iterator first(str.begin(), str.end(), std::regex("x"), -1), last;
std::vector<std::string> vec(first, last);
std::vector<std::string> s(first, last);
if (vec.size() < 2)
#endif
return rDefaultSize;
try {
ret.first = std::stoi(vec.at(0));
ret.second = std::stoi(vec.at(1));
ret.first = std::stoi(s[0]);
ret.second = std::stoi(s[1]);
}
catch (const std::invalid_argument& e) {
return rDefaultSize;
@ -71,7 +90,8 @@ static std::string SizeToString(const std::pair<int, int>& size)
return fmt::Format("%dx%d", size.first, size.second);
}
static std::pair<long, long> StringToPosition(const std::string& str)
// Unused?
/*static std::pair<long, long> StringToPosition(const std::string& str)
{
std::pair<long, long> ret;
std::sregex_token_iterator first(str.begin(), str.end(), std::regex("x"), -1), last;
@ -86,22 +106,40 @@ static std::pair<long, long> StringToPosition(const std::string& str)
return rDefaultPosition;
return ret;
}
}*/
static WindowInfo StringToWindowInfo(const std::string& str)
{
WindowInfo ret = WindowInfo(rDefaultSize, rDefaultSize);
#if 1
std::string s[4] = { "", "", "", "" };
for (uint i = 0, a = 0; i<str.size(); ++i)
{
if (!fmt::CmpNoCase(str.substr(i, 1), "x") || !fmt::CmpNoCase(str.substr(i, 1), ":"))
{
if (++a >= 4) return WindowInfo::GetDefault();
continue;
}
s[a] += str.substr(i, 1);
}
if (s[0].empty() || s[1].empty() || s[2].empty() || s[3].empty())
#else
// Requires GCC 4.9 or new stdlib for Clang
std::sregex_token_iterator first(str.begin(), str.end(), std::regex("x|:"), -1), last;
std::vector<std::string> vec(first, last);
std::vector<std::string> s(first, last);
if (vec.size() < 4)
#endif
return WindowInfo::GetDefault();
try{
ret.size.first = std::stoi(vec.at(0));
ret.size.second = std::stoi(vec.at(1));
ret.position.first = std::stoi(vec.at(2));
ret.position.second = std::stoi(vec.at(3));
ret.size.first = std::stoi(s[0]);
ret.size.second = std::stoi(s[1]);
ret.position.first = std::stoi(s[2]);
ret.position.second = std::stoi(s[3]);
}
catch (const std::invalid_argument &e)
{