Replace boost::locale with std::locale

This commit is contained in:
Tomas Jakobsson 2017-10-30 10:29:08 +01:00
parent a0ce48aeea
commit d3966da2b7
3 changed files with 3 additions and 5 deletions

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)

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))

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