Skip to content

fix macos errors #432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
auruya wants to merge 1 commit into
base: fcmp++-beta-stressnet
Choose a base branch
from
Open

fix macos errors #432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion contrib/epee/include/net/http_server_impl_base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,10 @@ namespace epee
{
//go to loop
MINFO("Run net_service loop( " << threads_count << " threads)...");
if(!m_net_server.run_server(threads_count, wait))
// set stack size
boost::thread::attributes attrs;
attrs.set_stack_size(THREAD_STACK_SIZE);
if(!m_net_server.run_server(threads_count, wait, attrs))
{
LOG_ERROR("Failed to run net tcp server!");
}
Expand Down
2 changes: 1 addition & 1 deletion src/cryptonote_core/blockchain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1621,7 +1621,7 @@ uint64_t Blockchain::get_long_term_block_weight_median(uint64_t start_height, si

MTRACE("requesting " << count << " from " << start_height << ", uncached");
const std::vector<uint64_t> weights = m_db->get_long_term_block_weights(start_height, count);
assert(weights.size() == std::min(count, blockchain_height - start_height));
assert(weights.size() == std::min(static_cast<uint64_t>(count), blockchain_height - start_height));
m_long_term_block_weights_cache_tip_hash = tip_hash;
for (const uint64_t w: weights)
m_long_term_block_weights_cache_rolling_median.insert(w);
Expand Down