LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Removes the Boost case_conv.hpp dependency.

Browse source 
This commit removes the `boost/algorithm/string/case_conv.hpp` dependency from the project. It replaces the `boost::to_lower` and `boost::to_upper` functions with custom functions that are locale independent and ASCII deterministic.
This commit is contained in:
251 2018-07-25 11:45:07 +02:00
parent 7a208d9fad
commit b193d5a443
4 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/netbase.cpp
View file

@ -19,8 +19,6 @@
#include <fcntl.h> #include <fcntl.h>
#endif #endif
#include <boost/algorithm/string/case_conv.hpp> // for to_lower()
#if !defined(MSG_NOSIGNAL) #if !defined(MSG_NOSIGNAL)
#define MSG_NOSIGNAL 0 #define MSG_NOSIGNAL 0
#endif #endif
@ -37,7 +35,7 @@ static const int SOCKS5_RECV_TIMEOUT = 20 * 1000;
static std::atomic<bool> interruptSocks5Recv(false); static std::atomic<bool> interruptSocks5Recv(false);
enum Network ParseNetwork(std::string net) { enum Network ParseNetwork(std::string net) {
boost::to_lower(net); Downcase(net);
if (net == "ipv4") return NET_IPV4; if (net == "ipv4") return NET_IPV4;
if (net == "ipv6") return NET_IPV6; if (net == "ipv6") return NET_IPV6;
if (net == "onion") return NET_ONION; if (net == "onion") return NET_ONION;

5
src/rpc/server.cpp
View file

@ -16,7 +16,6 @@
#include <boost/bind.hpp> #include <boost/bind.hpp>
#include <boost/signals2/signal.hpp> #include <boost/signals2/signal.hpp>
#include <boost/algorithm/string/case_conv.hpp> // for to_upper()
#include <boost/algorithm/string/classification.hpp> #include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/split.hpp> #include <boost/algorithm/string/split.hpp>
@ -192,9 +191,7 @@ std::string CRPCTable::help(const std::string& strCommand, const JSONRPCRequest&
if (!category.empty()) if (!category.empty())
strRet += "\n"; strRet += "\n";
category = pcmd->category; category = pcmd->category;
std::string firstLetter = category.substr(0,1); strRet += "== " + Capitalize(category) + " ==\n";
boost::to_upper(firstLetter);
strRet += "== " + firstLetter + category.substr(1) + " ==\n";
} }
} }
strRet += strHelp + "\n"; strRet += strHelp + "\n";

1
test/lint/lint-includes.sh
View file

@ -47,7 +47,6 @@ fi
EXPECTED_BOOST_INCLUDES=( EXPECTED_BOOST_INCLUDES=(
boost/algorithm/string.hpp boost/algorithm/string.hpp
boost/algorithm/string/case_conv.hpp
boost/algorithm/string/classification.hpp boost/algorithm/string/classification.hpp
boost/algorithm/string/replace.hpp boost/algorithm/string/replace.hpp
boost/algorithm/string/split.hpp boost/algorithm/string/split.hpp

2
test/lint/lint-locale-dependence.sh
View file

@ -11,11 +11,9 @@ KNOWN_VIOLATIONS=(
"src/dbwrapper.cpp:.*vsnprintf" "src/dbwrapper.cpp:.*vsnprintf"
"src/httprpc.cpp.*trim" "src/httprpc.cpp.*trim"
"src/init.cpp:.*atoi" "src/init.cpp:.*atoi"
"src/netbase.cpp.*to_lower"
"src/qt/rpcconsole.cpp:.*atoi" "src/qt/rpcconsole.cpp:.*atoi"
"src/qt/rpcconsole.cpp:.*isdigit" "src/qt/rpcconsole.cpp:.*isdigit"
"src/rest.cpp:.*strtol" "src/rest.cpp:.*strtol"
"src/rpc/server.cpp.*to_upper"
"src/test/dbwrapper_tests.cpp:.*snprintf" "src/test/dbwrapper_tests.cpp:.*snprintf"
"src/test/getarg_tests.cpp.*split" "src/test/getarg_tests.cpp.*split"
"src/torcontrol.cpp:.*atoi" "src/torcontrol.cpp:.*atoi"