Skip to content

use io_context instead of io_service; fixes build on latest boost #57

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

Merged
spoonincode merged 1 commit into from
Jan 10, 2025
Merged

use io_context instead of io_service; fixes build on latest boost #57

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
4 changes: 2 additions & 2 deletions include/chainbase/pinnable_mapped_file.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <system_error>
#include <boost/interprocess/managed_mapped_file.hpp>
#include <boost/interprocess/sync/file_lock.hpp>
#include <boost/asio/io_service.hpp>
#include <boost/asio/io_context.hpp>
#include <boost/container/flat_map.hpp>
#include <filesystem>
#include <vector>
Expand Down Expand Up @@ -85,7 +85,7 @@ class pinnable_mapped_file {

private:
void set_mapped_file_db_dirty(bool);
void load_database_file(boost::asio::io_service& sig_ios);
void load_database_file(boost::asio::io_context& sig_ios);
void save_database_file(bool flush = true);
static bool all_zeros(const std::byte* data, size_t sz);
void setup_non_file_mapping();
Expand Down
4 changes: 2 additions & 2 deletions src/pinnable_mapped_file.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ pinnable_mapped_file::pinnable_mapped_file(const std::filesystem::path& dir, boo
if (on_tempfs_filesystem(_data_file_path))
BOOST_THROW_EXCEPTION(std::system_error(make_error_code(db_error_code::tempfs_incompatible_mode)));

boost::asio::io_service sig_ios;
boost::asio::io_context sig_ios;
boost::asio::signal_set sig_set(sig_ios, SIGINT, SIGTERM);
#ifdef SIGPIPE
sig_set.add(SIGPIPE);
Expand Down Expand Up @@ -358,7 +358,7 @@ void pinnable_mapped_file::setup_non_file_mapping() {
#endif
}

void pinnable_mapped_file::load_database_file(boost::asio::io_service& sig_ios) {
void pinnable_mapped_file::load_database_file(boost::asio::io_context& sig_ios) {
std::cerr << "CHAINBASE: Preloading \"" << _database_name << "\" database file, this could take a moment..." << '\n';
char* const dst = (char*)_non_file_mapped_mapping;
size_t offset = 0;
Expand Down
Loading