Browse Source

an attempt to fix issue #111

miguelfreitas
Denis Ryabov 11 years ago
parent
commit
671bec8e78
  1. 3
      src/init.cpp
  2. 1
      src/makefile.android
  3. 1
      src/makefile.linux-mingw
  4. 1
      src/makefile.mingw
  5. 1
      src/makefile.osx
  6. 1
      src/makefile.osx-bitcoin
  7. 1
      src/makefile.unix
  8. 5
      src/twister.cpp
  9. 2
      twister-qt.pro

3
src/init.cpp

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

1
src/makefile.android

@ -174,6 +174,7 @@ LIBS += \
-l boost_filesystem$(BOOST_LIB_SUFFIX) \ -l boost_filesystem$(BOOST_LIB_SUFFIX) \
-l boost_program_options$(BOOST_LIB_SUFFIX) \ -l boost_program_options$(BOOST_LIB_SUFFIX) \
-l boost_thread$(BOOST_LIB_SUFFIX) \ -l boost_thread$(BOOST_LIB_SUFFIX) \
-l boost_locale$(BOOST_LIB_SUFFIX) \
-l db_cxx$(BDB_LIB_SUFFIX) \ -l db_cxx$(BDB_LIB_SUFFIX) \
-L$(NDK_BASE)/sources/cxx-stl/gnu-libstdc++/4.6/libs/armeabi/ -lgnustl_static -L$(NDK_BASE)/sources/cxx-stl/gnu-libstdc++/4.6/libs/armeabi/ -lgnustl_static
#-l ssl_static -l crypto_static #-l ssl_static -l crypto_static

1
src/makefile.linux-mingw

@ -30,6 +30,7 @@ LIBS= \
-l boost_program_options-mt-s \ -l boost_program_options-mt-s \
-l boost_thread_win32-mt-s \ -l boost_thread_win32-mt-s \
-l boost_chrono-mt-s \ -l boost_chrono-mt-s \
-l boost_locale-mt-s \
-l db_cxx \ -l db_cxx \
-l ssl \ -l ssl \
-l crypto -l crypto

1
src/makefile.mingw

@ -39,6 +39,7 @@ LIBS= \
-l boost_program_options$(BOOST_SUFFIX) \ -l boost_program_options$(BOOST_SUFFIX) \
-l boost_thread$(BOOST_SUFFIX) \ -l boost_thread$(BOOST_SUFFIX) \
-l boost_chrono$(BOOST_SUFFIX) \ -l boost_chrono$(BOOST_SUFFIX) \
-l boost_locale$(BOOST_SUFFIX) \
-l db_cxx \ -l db_cxx \
-l ssl \ -l ssl \
-l crypto -l crypto

1
src/makefile.osx vendored

@ -37,6 +37,7 @@ LIBS += \
-l boost_filesystem$(BOOST_LIB_SUFFIX) \ -l boost_filesystem$(BOOST_LIB_SUFFIX) \
-l boost_program_options$(BOOST_LIB_SUFFIX) \ -l boost_program_options$(BOOST_LIB_SUFFIX) \
-l boost_thread$(BOOST_LIB_SUFFIX) \ -l boost_thread$(BOOST_LIB_SUFFIX) \
-l boost_locale$(BOOST_LIB_SUFFIX) \
-l db_cxx$(BDB_LIB_SUFFIX) \ -l db_cxx$(BDB_LIB_SUFFIX) \
-l ssl \ -l ssl \
-l crypto -l crypto

1
src/makefile.osx-bitcoin

@ -50,6 +50,7 @@ LIBS += \
-lboost_program_options-mt \ -lboost_program_options-mt \
-lboost_thread-mt \ -lboost_thread-mt \
-lboost_chrono-mt \ -lboost_chrono-mt \
-lboost_locale-mt \
-lssl \ -lssl \
-lcrypto \ -lcrypto \
-lz -lz

1
src/makefile.unix

@ -38,6 +38,7 @@ LIBS += \
-l boost_filesystem$(BOOST_LIB_SUFFIX) \ -l boost_filesystem$(BOOST_LIB_SUFFIX) \
-l boost_program_options$(BOOST_LIB_SUFFIX) \ -l boost_program_options$(BOOST_LIB_SUFFIX) \
-l boost_thread$(BOOST_LIB_SUFFIX) \ -l boost_thread$(BOOST_LIB_SUFFIX) \
-l boost_locale$(BOOST_LIB_SUFFIX) \
-l db_cxx$(BDB_LIB_SUFFIX) \ -l db_cxx$(BDB_LIB_SUFFIX) \
-l ssl \ -l ssl \
-l crypto \ -l crypto \

5
src/twister.cpp

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

2
twister-qt.pro

@ -453,7 +453,7 @@ LIBS += $$join(BOOST_LIB_PATH,,-L,) $$join(BDB_LIB_PATH,,-L,) $$join(OPENSSL_LIB
LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX
# -lgdi32 has to happen after -lcrypto (see #681) # -lgdi32 has to happen after -lcrypto (see #681)
win32:LIBS += -lws2_32 -lshlwapi -lmswsock -lole32 -loleaut32 -luuid -lgdi32 win32:LIBS += -lws2_32 -lshlwapi -lmswsock -lole32 -loleaut32 -luuid -lgdi32
LIBS += -lboost_system$$BOOST_LIB_SUFFIX -lboost_filesystem$$BOOST_LIB_SUFFIX -lboost_program_options$$BOOST_LIB_SUFFIX -lboost_thread$$BOOST_THREAD_LIB_SUFFIX LIBS += -lboost_system$$BOOST_LIB_SUFFIX -lboost_filesystem$$BOOST_LIB_SUFFIX -lboost_program_options$$BOOST_LIB_SUFFIX -lboost_thread$$BOOST_THREAD_LIB_SUFFIX -lboost_locale$$BOOST_THREAD_LIB_SUFFIX
win32:LIBS += -lboost_chrono$$BOOST_LIB_SUFFIX win32:LIBS += -lboost_chrono$$BOOST_LIB_SUFFIX
macx:LIBS += -lboost_chrono$$BOOST_LIB_SUFFIX macx:LIBS += -lboost_chrono$$BOOST_LIB_SUFFIX

Loading…
Cancel
Save