Merge pull request #134 from elpendor/unstable

Replaced boost's regex with std's regex
This commit is contained in:
Aloshi 2013-09-25 05:49:38 -07:00
commit 896e0f460b
2 changed files with 3 additions and 3 deletions

View file

@ -35,7 +35,7 @@ endif()
find_package(FreeType REQUIRED) find_package(FreeType REQUIRED)
find_package(FreeImage REQUIRED) find_package(FreeImage REQUIRED)
find_package(SDL2 REQUIRED) find_package(SDL2 REQUIRED)
find_package(Boost REQUIRED COMPONENTS system filesystem regex) find_package(Boost REQUIRED COMPONENTS system filesystem)
find_package(Eigen3 REQUIRED) find_package(Eigen3 REQUIRED)
#add ALSA for Linux #add ALSA for Linux

View file

@ -1,6 +1,6 @@
#include "GameData.h" #include "GameData.h"
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <boost/regex/v4/regex.hpp> #include <regex>
#include <iostream> #include <iostream>
#include <ctime> #include <ctime>
#include <sstream> #include <sstream>
@ -60,7 +60,7 @@ std::string GameData::getBaseName() const
std::string GameData::getCleanName() const std::string GameData::getCleanName() const
{ {
return regex_replace(mBaseName, boost::regex("\\((.*)\\)|\\[(.*)\\]"), ""); return regex_replace(mBaseName, std::regex("\\((.*)\\)|\\[(.*)\\]"), "");
} }
void GameData::incTimesPlayed() void GameData::incTimesPlayed()