Skip to content

Commit 3f1fd45

Browse files
committed
Merge pull request #60 from evoskuil/master
Remove dead code, fix missing includes.
2 parents d016b51 + cd98c0c commit 3f1fd45

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

builds/msvc/vs2013/libbitcoin.import.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
<!-- can't define _SCL_SECURE_NO_WARNINGS when using boost, can produce redefined symbol error, use 4996 instead -->
2020
<DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
2121
<!-- NOMINMAX enables use of std::min/max without conflict. -->
22-
<PreprocessorDefinitions>NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
22+
<!-- WIN32_LEAN_AND_MEAN avoids boost conflict: lists.boost.org/boost-users/2008/07/37824.php. -->
23+
<PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
2324
<PreprocessorDefinitions Condition="'$(Option-testnet)' == 'true'">ENABLE_TESTNET;%(PreprocessorDefinitions)</PreprocessorDefinitions>
2425
<PreprocessorDefinitions Condition="'$(Linkage-libbitcoin)' == 'static' Or '$(Linkage-libbitcoin)' == 'ltcg'">BC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
2526
</ClCompile>

install.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,7 @@ SECP256K1_OPTIONS=\
230230
#------------------------------------------------------------------------------
231231
BITCOIN_OPTIONS=\
232232
"--without-tests "\
233+
"--without-examples "\
233234
"${with_boost} "\
234235
"${with_pkgconfigdir} "
235236

src/endpoint.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include <iostream>
2424
#include <regex>
2525
#include <string>
26+
#include <boost/regex.hpp>
2627
#include <boost/program_options.hpp>
2728
#include <boost/regex.hpp>
2829
#include <bitcoin/bitcoin.hpp>
@@ -31,7 +32,6 @@ namespace libbitcoin {
3132
namespace server {
3233

3334
using namespace boost;
34-
using namespace boost::algorithm;
3535
using namespace boost::program_options;
3636

3737
endpoint_type::endpoint_type()

0 commit comments

Comments
 (0)