twisterarmy/twister-core
1
0
Fork 0
mirror of https://github.com/twisterarmy/twister-core.git synced 2025-01-10 14:58:05 +00:00
Code Issues Projects Releases Wiki Activity

check HAVE_BOOST_LOCALE and fix compilation when boost-locale is not available

Browse Source
This commit is contained in:
Miguel Freitas 2014-04-11 18:03:24 -03:00
parent f38b97ddf3
commit d4b1c9b569
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/init.cpp
View File

@ -22,8 +22,10 @@
#include <boost/filesystem/convenience.hpp>
#include <boost/interprocess/sync/file_lock.hpp>
#include <boost/algorithm/string/predicate.hpp>
#include <boost/locale.hpp>
#include <boost/locale/generator.hpp>
#ifdef HAVE_BOOST_LOCALE
#include <boost/locale.hpp>
#include <boost/locale/generator.hpp>
#endif
#include <openssl/crypto.h>
#ifndef WIN32
@ -401,7 +403,9 @@ bool AppInit2(boost::thread_group& threadGroup)
#endif
#endif
#endif
#ifdef HAVE_BOOST_LOCALE
std::locale::global(boost::locale::generator().generate(""));
#endif
// ********************************************************* Step 2: parameter interactions

12
src/twister.cpp
View File

@ -13,7 +13,9 @@ using namespace json_spirit;
using namespace std;
#include <boost/filesystem.hpp>
#include <boost/locale.hpp>
#ifdef HAVE_BOOST_LOCALE
#include <boost/locale.hpp>
#endif
#include <boost/algorithm/string.hpp>
#include <boost/lexical_cast.hpp>
@ -1227,7 +1229,11 @@ void updateSeenHashtags(std::string &message, int64_t msgTime)
BOOST_FOREACH(string const& token, tokens) {
if( token.length() >= 2 ) {
string word = token.substr(1);
#ifdef HAVE_BOOST_LOCALE
word = boost::locale::to_lower(word);
#else
boost::algorithm::to_lower(word);
#endif
if( token.at(0) == '#') {
hashtags.insert(word);
}
@ -1490,7 +1496,11 @@ Value newpostmsg(const Array& params, bool fHelp)
BOOST_FOREACH(string const& token, tokens) {
if( token.length() >= 2 ) {
string word = token.substr(1);
#ifdef HAVE_BOOST_LOCALE
word = boost::locale::to_lower(word);
#else
boost::algorithm::to_lower(word);
#endif
if( token.at(0) == '#') {
ses->dht_putData(word, "hashtag", true,
v, strUsername, GetAdjustedTime(), 0);