Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-05-02 17:24:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

mac osx building fixes

Browse source
This commit is contained in:
mydesktop 2014-04-30 16:50:06 -04:00
parent 67df296650
commit 79a4bedc36
11 changed files with 41 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
contrib/epee/include/net/abstract_tcp_server2.h
View file

@ -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
#endif

4
contrib/epee/include/net/abstract_tcp_server2.inl
View file

@ -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();

2
contrib/epee/include/storages/portable_storage.h
View file

@ -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);