Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-25 23:55:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #276 from tomaz82/replaceBoostLocale

Browse source 
[Suggestion] Replace boost::locale with std::locale
This commit is contained in:
Jools Wills 2017-10-30 18:55:02 +00:00 committed by GitHub
parent a0ce48aeea d3966da2b7
commit 92671bc217
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -50,9 +50,9 @@ find_package(Freetype REQUIRED)
find_package(FreeImage REQUIRED) find_package(FreeImage REQUIRED)
find_package(SDL2 REQUIRED) find_package(SDL2 REQUIRED)
if(MSVC) if(MSVC)
find_package(Boost REQUIRED COMPONENTS system date_time locale) find_package(Boost REQUIRED COMPONENTS system date_time)
else() else()
find_package(Boost REQUIRED COMPONENTS system filesystem date_time locale) find_package(Boost REQUIRED COMPONENTS system filesystem date_time)
endif() endif()
find_package(CURL REQUIRED) find_package(CURL REQUIRED)
find_package(VLC REQUIRED) find_package(VLC REQUIRED)

3
es-app/src/main.cpp
View file

@ -20,7 +20,6 @@
#include "Settings.h" #include "Settings.h"
#include "ScraperCmdLine.h" #include "ScraperCmdLine.h"
#include <sstream> #include <sstream>
#include <boost/locale.hpp>
#include <FreeImage.h> #include <FreeImage.h>
#ifdef WIN32 #ifdef WIN32
@ -182,7 +181,7 @@ int main(int argc, char* argv[])
unsigned int width = 0; unsigned int width = 0;
unsigned int height = 0; unsigned int height = 0;
std::locale::global(boost::locale::generator().generate("")); std::locale::global(std::locale(std::locale(""), "C", std::locale::numeric));
boost::filesystem::path::imbue(std::locale()); boost::filesystem::path::imbue(std::locale());
if(!parseArgs(argc, argv, &width, &height)) if(!parseArgs(argc, argv, &width, &height))

1
es-core/src/guis/GuiDetectDevice.cpp
View file

@ -10,7 +10,6 @@
#include <sstream> #include <sstream>
#include "Util.h" #include "Util.h"
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <boost/locale.hpp>
#define HOLD_TIME 1000 #define HOLD_TIME 1000