aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2017-04-25 12:04:24 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2017-04-25 12:04:52 +0200
commit95f5e44075028d86ac35839696a0df51792a4f04 (patch)
treed0a32eb8a85f57782a23473faa08b6637302feea
parent54e2d87e792f683593fd9f06c2e1bff4b03a0e75 (diff)
parent93dbb15954679c1b2eb2ad59e601c5523272e810 (diff)
Merge #10270: Remove Clang workaround for Boost 1.46
93dbb15 Remove Clang workaround for Boost 1.46 (fanquake) Tree-SHA512: 1246841b264688f5fe5a2a514dd732d400307fa068686857e8aedaebb292ae65b21ab96b5ff9477ccd2f049882b967b6e143683963ce1be0b9e781596c5372d1
-rw-r--r--src/util.cpp13
1 files changed, 0 insertions, 13 deletions
diff --git a/src/util.cpp b/src/util.cpp
index 0dc203cba5..cf10ee4aa5 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -88,19 +88,6 @@
#include <openssl/rand.h>
#include <openssl/conf.h>
-// Work around clang compilation problem in Boost 1.46:
-// /usr/include/boost/program_options/detail/config_file.hpp:163:17: error: call to function 'to_internal' that is neither visible in the template definition nor found by argument-dependent lookup
-// See also: http://stackoverflow.com/questions/10020179/compilation-fail-in-boost-librairies-program-options
-// http://clang.debian.net/status.php?version=3.0&key=CANNOT_FIND_FUNCTION
-namespace boost {
-
- namespace program_options {
- std::string to_internal(const std::string&);
- }
-
-} // namespace boost
-
-
const char * const BITCOIN_CONF_FILENAME = "bitcoin.conf";
const char * const BITCOIN_PID_FILENAME = "bitcoind.pid";