Merge pull request #288 from evoskuil/master

evoskuil · web-flow · commit 8920cccda021 · 2025-05-25T14:14:58.000-04:00
Remove boost chrono, make json/container header only, no import heade…
diff --git a/builds/cmake/CMakeLists.txt b/builds/cmake/CMakeLists.txt
@@ -140,7 +140,7 @@ endif()
 
 # Find boost
 #------------------------------------------------------------------------------
-find_package( Boost 1.76.0 REQUIRED COMPONENTS
+find_package( Boost 1.86.0 REQUIRED COMPONENTS
     unit_test_framework )
 
 set( boost_unit_test_framework_LIBS "-lboost_unit_test_framework" )
diff --git a/builds/msvc/vs2022/libbitcoin-protocol-test/libbitcoin-protocol-test.props b/builds/msvc/vs2022/libbitcoin-protocol-test/libbitcoin-protocol-test.props
@@ -12,7 +12,6 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <EnablePREfast>false</EnablePREfast>
-      <!--<PreprocessorDefinitions Condition="'$(DefaultLinkage)' == 'dynamic'">BOOST_TEST_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>-->
     </ClCompile>
     <PostBuildEvent Condition="'$(DebugOrRelease)' == 'release'">
       <Command>"$(TargetPath)" --log_level=warning --run_test=* --show_progress=no --build_info=yes</Command>
diff --git a/builds/msvc/vs2022/libbitcoin-protocol-test/libbitcoin-protocol-test.vcxproj b/builds/msvc/vs2022/libbitcoin-protocol-test/libbitcoin-protocol-test.vcxproj
@@ -144,13 +144,9 @@
   <ImportGroup Label="ExtensionSettings">
     <Import Project="$(NuGetPackageRoot)boost.1.86.0\build\boost.targets" Condition="Exists('$(NuGetPackageRoot)boost.1.86.0\build\boost.targets')" />
     <Import Project="$(NuGetPackageRoot)libzmq_vc143.4.3.2\build\native\libzmq_vc143.targets" Condition="Exists('$(NuGetPackageRoot)libzmq_vc143.4.3.2\build\native\libzmq_vc143.targets')" />
-    <Import Project="$(NuGetPackageRoot)boost_chrono-vc143.1.86.0\build\boost_chrono-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_chrono-vc143.1.86.0\build\boost_chrono-vc143.targets')" />
-    <Import Project="$(NuGetPackageRoot)boost_container-vc143.1.86.0\build\boost_container-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_container-vc143.1.86.0\build\boost_container-vc143.targets')" />
     <Import Project="$(NuGetPackageRoot)boost_iostreams-vc143.1.86.0\build\boost_iostreams-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_iostreams-vc143.1.86.0\build\boost_iostreams-vc143.targets')" />
-    <Import Project="$(NuGetPackageRoot)boost_json-vc143.1.86.0\build\boost_json-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_json-vc143.1.86.0\build\boost_json-vc143.targets')" />
     <Import Project="$(NuGetPackageRoot)boost_locale-vc143.1.86.0\build\boost_locale-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_locale-vc143.1.86.0\build\boost_locale-vc143.targets')" />
     <Import Project="$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets')" />
-    <Import Project="$(NuGetPackageRoot)boost_system-vc143.1.86.0\build\boost_system-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_system-vc143.1.86.0\build\boost_system-vc143.targets')" />
     <Import Project="$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets')" />
     <Import Project="$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets')" />
     <Import Project="$(NuGetPackageRoot)boost_unit_test_framework-vc143.1.86.0\build\boost_unit_test_framework-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_unit_test_framework-vc143.1.86.0\build\boost_unit_test_framework-vc143.targets')" />
@@ -161,13 +157,9 @@
     </PropertyGroup>
     <Error Condition="!Exists('$(NuGetPackageRoot)boost.1.86.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost.1.86.0\build\boost.targets'))" />
     <Error Condition="!Exists('$(NuGetPackageRoot)libzmq_vc143.4.3.2\build\native\libzmq_vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libzmq_vc143.4.3.2\build\native\libzmq_vc143.targets'))" />
-    <Error Condition="!Exists('$(NuGetPackageRoot)boost_chrono-vc143.1.86.0\build\boost_chrono-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_chrono-vc143.1.86.0\build\boost_chrono-vc143.targets'))" />
-    <Error Condition="!Exists('$(NuGetPackageRoot)boost_container-vc143.1.86.0\build\boost_container-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_container-vc143.1.86.0\build\boost_container-vc143.targets'))" />
     <Error Condition="!Exists('$(NuGetPackageRoot)boost_iostreams-vc143.1.86.0\build\boost_iostreams-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_iostreams-vc143.1.86.0\build\boost_iostreams-vc143.targets'))" />
-    <Error Condition="!Exists('$(NuGetPackageRoot)boost_json-vc143.1.86.0\build\boost_json-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_json-vc143.1.86.0\build\boost_json-vc143.targets'))" />
     <Error Condition="!Exists('$(NuGetPackageRoot)boost_locale-vc143.1.86.0\build\boost_locale-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_locale-vc143.1.86.0\build\boost_locale-vc143.targets'))" />
     <Error Condition="!Exists('$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets'))" />
-    <Error Condition="!Exists('$(NuGetPackageRoot)boost_system-vc143.1.86.0\build\boost_system-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_system-vc143.1.86.0\build\boost_system-vc143.targets'))" />
     <Error Condition="!Exists('$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets'))" />
     <Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets'))" />
     <Error Condition="!Exists('$(NuGetPackageRoot)boost_unit_test_framework-vc143.1.86.0\build\boost_unit_test_framework-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_unit_test_framework-vc143.1.86.0\build\boost_unit_test_framework-vc143.targets'))" />
diff --git a/builds/msvc/vs2022/libbitcoin-protocol-test/packages.config b/builds/msvc/vs2022/libbitcoin-protocol-test/packages.config
@@ -8,13 +8,9 @@
 <packages>
   <package id="boost" version="1.86.0" targetFramework="Native" />
   <package id="libzmq_vc143" version="4.3.2" targetFramework="Native" />
-  <package id="boost_chrono-vc143" version="1.86.0" targetFramework="Native" />
-  <package id="boost_container-vc143" version="1.86.0" targetFramework="Native" />
   <package id="boost_iostreams-vc143" version="1.86.0" targetFramework="Native" />
-  <package id="boost_json-vc143" version="1.86.0" targetFramework="Native" />
   <package id="boost_locale-vc143" version="1.86.0" targetFramework="Native" />
   <package id="boost_program_options-vc143" version="1.86.0" targetFramework="Native" />
-  <package id="boost_system-vc143" version="1.86.0" targetFramework="Native" />
   <package id="boost_thread-vc143" version="1.86.0" targetFramework="Native" />
   <package id="secp256k1_vc143" version="0.1.0.21" targetFramework="Native" />
   <package id="boost_unit_test_framework-vc143" version="1.86.0" targetFramework="Native" />
diff --git a/builds/msvc/vs2022/libbitcoin-protocol/libbitcoin-protocol.vcxproj b/builds/msvc/vs2022/libbitcoin-protocol/libbitcoin-protocol.vcxproj
@@ -167,13 +167,9 @@
   <ImportGroup Label="ExtensionSettings">
     <Import Project="$(NuGetPackageRoot)boost.1.86.0\build\boost.targets" Condition="Exists('$(NuGetPackageRoot)boost.1.86.0\build\boost.targets')" />
     <Import Project="$(NuGetPackageRoot)libzmq_vc143.4.3.2\build\native\libzmq_vc143.targets" Condition="Exists('$(NuGetPackageRoot)libzmq_vc143.4.3.2\build\native\libzmq_vc143.targets')" />
-    <Import Project="$(NuGetPackageRoot)boost_chrono-vc143.1.86.0\build\boost_chrono-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_chrono-vc143.1.86.0\build\boost_chrono-vc143.targets')" />
-    <Import Project="$(NuGetPackageRoot)boost_container-vc143.1.86.0\build\boost_container-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_container-vc143.1.86.0\build\boost_container-vc143.targets')" />
     <Import Project="$(NuGetPackageRoot)boost_iostreams-vc143.1.86.0\build\boost_iostreams-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_iostreams-vc143.1.86.0\build\boost_iostreams-vc143.targets')" />
-    <Import Project="$(NuGetPackageRoot)boost_json-vc143.1.86.0\build\boost_json-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_json-vc143.1.86.0\build\boost_json-vc143.targets')" />
     <Import Project="$(NuGetPackageRoot)boost_locale-vc143.1.86.0\build\boost_locale-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_locale-vc143.1.86.0\build\boost_locale-vc143.targets')" />
     <Import Project="$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets')" />
-    <Import Project="$(NuGetPackageRoot)boost_system-vc143.1.86.0\build\boost_system-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_system-vc143.1.86.0\build\boost_system-vc143.targets')" />
     <Import Project="$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets')" />
     <Import Project="$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets')" />
   </ImportGroup>
@@ -183,13 +179,9 @@
     </PropertyGroup>
     <Error Condition="!Exists('$(NuGetPackageRoot)boost.1.86.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost.1.86.0\build\boost.targets'))" />
     <Error Condition="!Exists('$(NuGetPackageRoot)libzmq_vc143.4.3.2\build\native\libzmq_vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libzmq_vc143.4.3.2\build\native\libzmq_vc143.targets'))" />
-    <Error Condition="!Exists('$(NuGetPackageRoot)boost_chrono-vc143.1.86.0\build\boost_chrono-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_chrono-vc143.1.86.0\build\boost_chrono-vc143.targets'))" />
-    <Error Condition="!Exists('$(NuGetPackageRoot)boost_container-vc143.1.86.0\build\boost_container-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_container-vc143.1.86.0\build\boost_container-vc143.targets'))" />
     <Error Condition="!Exists('$(NuGetPackageRoot)boost_iostreams-vc143.1.86.0\build\boost_iostreams-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_iostreams-vc143.1.86.0\build\boost_iostreams-vc143.targets'))" />
-    <Error Condition="!Exists('$(NuGetPackageRoot)boost_json-vc143.1.86.0\build\boost_json-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_json-vc143.1.86.0\build\boost_json-vc143.targets'))" />
     <Error Condition="!Exists('$(NuGetPackageRoot)boost_locale-vc143.1.86.0\build\boost_locale-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_locale-vc143.1.86.0\build\boost_locale-vc143.targets'))" />
     <Error Condition="!Exists('$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets'))" />
-    <Error Condition="!Exists('$(NuGetPackageRoot)boost_system-vc143.1.86.0\build\boost_system-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_system-vc143.1.86.0\build\boost_system-vc143.targets'))" />
     <Error Condition="!Exists('$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets'))" />
     <Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets'))" />
   </Target>
diff --git a/builds/msvc/vs2022/libbitcoin-protocol/packages.config b/builds/msvc/vs2022/libbitcoin-protocol/packages.config
@@ -8,13 +8,9 @@
 <packages>
   <package id="boost" version="1.86.0" targetFramework="Native" />
   <package id="libzmq_vc143" version="4.3.2" targetFramework="Native" />
-  <package id="boost_chrono-vc143" version="1.86.0" targetFramework="Native" />
-  <package id="boost_container-vc143" version="1.86.0" targetFramework="Native" />
   <package id="boost_iostreams-vc143" version="1.86.0" targetFramework="Native" />
-  <package id="boost_json-vc143" version="1.86.0" targetFramework="Native" />
   <package id="boost_locale-vc143" version="1.86.0" targetFramework="Native" />
   <package id="boost_program_options-vc143" version="1.86.0" targetFramework="Native" />
-  <package id="boost_system-vc143" version="1.86.0" targetFramework="Native" />
   <package id="boost_thread-vc143" version="1.86.0" targetFramework="Native" />
   <package id="secp256k1_vc143" version="0.1.0.21" targetFramework="Native" />
 </packages>
diff --git a/builds/msvc/vs2022/libbitcoin-system.import.props b/builds/msvc/vs2022/libbitcoin-system.import.props
@@ -50,6 +50,8 @@
       <!-- NOMINMAX enables use of std::min/max without conflict. -->
       <!-- WIN32_LEAN_AND_MEAN avoids inclusion of certain headers, winsock.h conflicts with boost and protocol use of winsock2.h. -->
       <PreprocessorDefinitions>WITH_ICU;WIN32_LEAN_AND_MEAN;NOMINMAX;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <!-- Disable auto-linking for all boost-json and its dependency boost-container so they can be header only. -->
+      <PreprocessorDefinitions>BOOST_JSON_NO_LIB;BOOST_CONTAINER_NO_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Linkage-libbitcoin-system)' == 'static' Or '$(Linkage-libbitcoin-system)' == 'ltcg'">BC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="$(Configuration.IndexOf('Debug')) != -1">_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <!-- Enable use of CPU intrinsics. -->
diff --git a/configure.ac b/configure.ac
@@ -213,17 +213,17 @@ AS_CASE([${CC}], [*],
 
 # Check dependencies.
 #==============================================================================
-# Require Boost of at least version 1.76.0 and output ${boost_CPPFLAGS/LDFLAGS}.
+# Require Boost of at least version 1.86.0 and output ${boost_CPPFLAGS/LDFLAGS}.
 #------------------------------------------------------------------------------
 AS_CASE([${CC}], [*],
-    [AX_BOOST_BASE([1.76.0],
+    [AX_BOOST_BASE([1.86.0],
         [AC_SUBST([boost_CPPFLAGS], [${BOOST_CPPFLAGS}])
          AC_SUBST([boost_ISYS_CPPFLAGS], [`echo ${BOOST_CPPFLAGS} | $SED s/^-I/-isystem/g | $SED s/' -I'/' -isystem'/g`])
          AC_SUBST([boost_LDFLAGS], [${BOOST_LDFLAGS}])
          AC_MSG_NOTICE([boost_CPPFLAGS : ${boost_CPPFLAGS}])
          AC_MSG_NOTICE([boost_ISYS_CPPFLAGS : ${boost_ISYS_CPPFLAGS}])
          AC_MSG_NOTICE([boost_LDFLAGS : ${boost_LDFLAGS}])],
-        [AC_MSG_ERROR([Boost 1.76.0 or later is required but was not found.])])])
+        [AC_MSG_ERROR([Boost 1.86.0 or later is required but was not found.])])])
 
 AS_CASE([${enable_isystem}],[yes],
     [AC_SUBST([boost_BUILD_CPPFLAGS], [${boost_ISYS_CPPFLAGS}])],
diff --git a/include/bitcoin/protocol/boost.hpp b/include/bitcoin/protocol/boost.hpp
@@ -22,12 +22,10 @@
 #include <boost/asio.hpp>
 #include <boost/format.hpp>
 #include <boost/regex.hpp>
-#include <boost/thread.hpp>
 
 namespace libbitcoin {
 namespace protocol {
-    
-typedef boost::thread thread;
+
 typedef boost::asio::ip::address ip;
 typedef boost::asio::ip::address_v4 ipv4;
 typedef boost::asio::ip::address_v6 ipv6;
diff --git a/include/bitcoin/protocol/zmq/worker.hpp b/include/bitcoin/protocol/zmq/worker.hpp
@@ -23,6 +23,7 @@
 #include <memory>
 #include <future>
 #include <shared_mutex>
+#include <thread>
 #include <bitcoin/system.hpp>
 #include <bitcoin/protocol/boost.hpp>
 #include <bitcoin/protocol/define.hpp>
@@ -67,7 +68,7 @@ class BCP_API worker
     std::atomic<bool> stopped_;
     std::promise<bool> started_;
     std::promise<bool> finished_;
-    std::shared_ptr<thread> thread_;
+    std::shared_ptr<std::thread> thread_;
     const thread_priority priority_;
     mutable std::shared_mutex mutex_;
 };
diff --git a/install-cmake.sh b/install-cmake.sh
@@ -75,8 +75,8 @@ ZMQ_ARCHIVE="zeromq-4.3.5.tar.gz"
 
 # Boost archive.
 #------------------------------------------------------------------------------
-BOOST_URL="https://archives.boost.io/release/1.78.0/source/boost_1_78_0.tar.bz2"
-BOOST_ARCHIVE="boost_1_78_0.tar.bz2"
+BOOST_URL="https://archives.boost.io/release/1.86.0/source/boost_1_86_0.tar.bz2"
+BOOST_ARCHIVE="boost_1_86_0.tar.bz2"
 
 
 # Define utility functions.
@@ -1034,12 +1034,9 @@ ICU_OPTIONS=(
 # Define boost options.
 #------------------------------------------------------------------------------
 BOOST_OPTIONS=(
-"--with-chrono" \
 "--with-iostreams" \
-"--with-json" \
 "--with-locale" \
 "--with-program_options" \
-"--with-system" \
 "--with-thread" \
 "--with-test")
 
diff --git a/install-cmakepresets.sh b/install-cmakepresets.sh
@@ -1076,13 +1076,9 @@ ICU_OPTIONS=(
 # Define boost options.
 #------------------------------------------------------------------------------
 BOOST_OPTIONS=(
-"--with-chrono" \
 "--with-iostreams" \
-"--with-json" \
 "--with-locale" \
 "--with-program_options" \
-"--with-system" \
-"--with-thread" \
 "--with-test")
 
 # Define secp256k1 options.
diff --git a/install.sh b/install.sh
@@ -75,8 +75,8 @@ ZMQ_ARCHIVE="zeromq-4.3.5.tar.gz"
 
 # Boost archive.
 #------------------------------------------------------------------------------
-BOOST_URL="https://archives.boost.io/release/1.78.0/source/boost_1_78_0.tar.bz2"
-BOOST_ARCHIVE="boost_1_78_0.tar.bz2"
+BOOST_URL="https://archives.boost.io/release/1.86.0/source/boost_1_86_0.tar.bz2"
+BOOST_ARCHIVE="boost_1_86_0.tar.bz2"
 
 
 # Define utility functions.
@@ -908,12 +908,9 @@ ICU_OPTIONS=(
 # Define boost options.
 #------------------------------------------------------------------------------
 BOOST_OPTIONS=(
-"--with-chrono" \
 "--with-iostreams" \
-"--with-json" \
 "--with-locale" \
 "--with-program_options" \
-"--with-system" \
 "--with-thread" \
 "--with-test")
 
diff --git a/src/zmq/worker.cpp b/src/zmq/worker.cpp
@@ -20,6 +20,7 @@
 
 #include <future>
 #include <mutex>
+#include <thread>
 #include <bitcoin/system.hpp>
 #include <bitcoin/protocol/boost.hpp>
 #include <bitcoin/protocol/zmq/message.hpp>
@@ -56,7 +57,7 @@ bool worker::start() NOEXCEPT
         stopped_ = false;
 
         // Create the worker thread and socket and start polling.
-        thread_ = std::make_shared<thread>(&worker::work, this);
+        thread_ = std::make_shared<std::thread>(&worker::work, this);
 
         // Wait on worker start.
         const auto result = started_.get_future().get();
