From: Gavin Andresen Date: Thu, 5 Apr 2012 14:36:23 +0000 (-0700) Subject: Merge pull request #1043 from Diapolo/misc X-Git-Tag: v0.4.0-unstable~129^2~103 X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=399ff1fe05aba8bdde092144eb524198a810f3ac;hp=895c12943b1845411fb0282c17683c7b29a61459;p=novacoin.git Merge pull request #1043 from Diapolo/misc removed obsolete boost workaround (boost ticket #4258) --- diff --git a/src/util.cpp b/src/util.cpp index 4f34ab6..5c47551 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -33,16 +33,6 @@ bool fNoListen = false; bool fLogTimestamps = false; CMedianFilter vTimeOffsets(200,0); - - -// Workaround for "multiple definition of `_tls_used'" -// http://svn.boost.org/trac/boost/ticket/4258 -extern "C" void tss_cleanup_implemented() { } - - - - - // Init openssl library multithreading support static boost::interprocess::interprocess_mutex** ppmutexOpenSSL; void locking_callback(int mode, int i, const char* file, int line)