Merge remote-tracking branch 'origin' into openssl

8 years ago · ff6a79bca3
parent 9d998d27c5 e4d6092939
commit ff6a79bca3
1 changed files with 4 additions and 0 deletions
--- a/RouterInfo.cpp
+++ b/RouterInfo.cpp
@ -771,7 +771,11 @@ namespace data
 		
 	std::shared_ptr<const RouterInfo::Address> RouterInfo::GetAddress (TransportStyle s, bool v4only, bool v6only) const
 	{
+#if (BOOST_VERSION >= 105300)
+		auto addresses = boost::atomic_load (&m_Addresses);
+#else		
 		auto addresses = m_Addresses;
+#endif		
 		for (const auto& address : *addresses)
 		{
 			if (address->transportStyle == s)