diff options
| author | mydesktop <dev.mc2@gmail.com> | 2014-04-30 16:50:06 -0400 |
|---|---|---|
| committer | mydesktop <dev.mc2@gmail.com> | 2014-04-30 16:50:06 -0400 |
| commit | 79a4bedc3669dfd3a3845e78ede144b5d7be7d1c (patch) | |
| tree | b34d971740ab96625267b6d2fd3f03fa6ac81977 /contrib | |
| parent | various fixes to allow mac osx compilation (diff) | |
| download | monero-79a4bedc3669dfd3a3845e78ede144b5d7be7d1c.tar.xz | |
mac osx building fixes
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/epee/include/net/abstract_tcp_server2.h | 4 | ||||
| -rw-r--r-- | contrib/epee/include/net/abstract_tcp_server2.inl | 4 | ||||
| -rw-r--r-- | contrib/epee/include/storages/portable_storage.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/contrib/epee/include/net/abstract_tcp_server2.h b/contrib/epee/include/net/abstract_tcp_server2.h index 29bf59a57..b8e291c32 100644 --- a/contrib/epee/include/net/abstract_tcp_server2.h +++ b/contrib/epee/include/net/abstract_tcp_server2.h @@ -153,7 +153,7 @@ namespace net_utils bool init_server(const std::string port, const std::string& address = "0.0.0.0"); /// Run the server's io_service loop. - bool run_server(size_t threads_count, bool wait = true); + bool run_server(size_t threads_count, bool wait = true, const boost::thread::attributes& attrs = boost::thread::attributes()); /// wait for service workers stop bool timed_wait_server_stop(uint64_t wait_mseconds); @@ -273,4 +273,4 @@ namespace net_utils #include "abstract_tcp_server2.inl" -#endif
\ No newline at end of file +#endif diff --git a/contrib/epee/include/net/abstract_tcp_server2.inl b/contrib/epee/include/net/abstract_tcp_server2.inl index 236bc1599..2a4b10e48 100644 --- a/contrib/epee/include/net/abstract_tcp_server2.inl +++ b/contrib/epee/include/net/abstract_tcp_server2.inl @@ -524,7 +524,7 @@ POP_WARNINGS } //--------------------------------------------------------------------------------- template<class t_protocol_handler> - bool boosted_tcp_server<t_protocol_handler>::run_server(size_t threads_count, bool wait) + bool boosted_tcp_server<t_protocol_handler>::run_server(size_t threads_count, bool wait, const boost::thread::attributes& attrs) { TRY_ENTRY(); m_threads_count = threads_count; @@ -538,7 +538,7 @@ POP_WARNINGS for (std::size_t i = 0; i < threads_count; ++i) { boost::shared_ptr<boost::thread> thread(new boost::thread( - boost::bind(&boosted_tcp_server<t_protocol_handler>::worker_thread, this))); + attrs, boost::bind(&boosted_tcp_server<t_protocol_handler>::worker_thread, this))); m_threads.push_back(thread); } CRITICAL_REGION_END(); diff --git a/contrib/epee/include/storages/portable_storage.h b/contrib/epee/include/storages/portable_storage.h index 21904da9e..c244dac19 100644 --- a/contrib/epee/include/storages/portable_storage.h +++ b/contrib/epee/include/storages/portable_storage.h @@ -210,7 +210,7 @@ namespace epee template<class t_value> bool portable_storage::get_value(const std::string& value_name, t_value& val, hsection hparent_section) { - //BOOST_MPL_ASSERT(( boost::mpl::contains<storage_entry::types, t_value> )); + BOOST_MPL_ASSERT(( boost::mpl::contains<storage_entry::types, t_value> )); //TRY_ENTRY(); if(!hparent_section) hparent_section = &m_root; storage_entry* pentry = find_storage_entry(value_name, hparent_section); |