Skip to content

Proper Boost version handling #1049

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
Bjoe wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Proper Boost version handling #1049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2d240f1
Take boost version from boost header
Bjoe Jul 2, 2026
79d6f68
Update utility.cpp change to BOOST_VERSION
Bjoe Jul 2, 2026
1a71aee
Update Android.bp remove VSOMEIP_BOOST_VERSION
Bjoe Jul 2, 2026
911a001
Update utility.cpp add boost version header
Bjoe Jul 2, 2026
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
1 change: 0 additions & 1 deletion Android.bp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ cc_defaults {
name: "vsomeip_lib_defaults",

cflags: [
"-DVSOMEIP_BOOST_VERSION=107500",
"-DVSOMEIP_INTERNAL_SUPPRESS_DEPRECATED",
// std::result_of was removed in C++20; force Boost.Asio 1.75 to use
// std::invoke_result instead (supported since Boost 1.74).
Expand Down
2 changes: 0 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,8 +219,6 @@ endif()

message( STATUS "Using boost version: ${VSOMEIP_BOOST_VERSION}" )

set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVSOMEIP_BOOST_VERSION=${VSOMEIP_BOOST_VERSION}")

find_package(PkgConfig)

# DLT
Expand Down
7 changes: 4 additions & 3 deletions implementation/service_discovery/include/service_discovery_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

#pragma once

#include <boost/version.hpp>
#include <boost/asio/ip/address.hpp>
#include <map>
#include <memory>
Expand All @@ -30,7 +31,7 @@
#include "deserializer.hpp"
#include "message_impl.hpp"

#if VSOMEIP_BOOST_VERSION < 107600
#if BOOST_VERSION < 107600
#include <boost/container_hash/hash.hpp>

// Custom hash function for boost::asio::ip::address.
Expand All @@ -42,7 +43,7 @@ struct address_hash {
: boost::hash<boost::asio::ip::address_v6::bytes_type>()(addr.to_v6().to_bytes());
}
};
#endif // VSOMEIP_BOOST_VERSION < 107600
#endif // BOOST_VERSION < 107600

namespace vsomeip_v3 {

Expand Down Expand Up @@ -453,7 +454,7 @@ class service_discovery_impl : public service_discovery, public std::enable_shar
std::atomic<uint32_t> offers_received_;

// List of hosts from which we have received unicast and multicast messages.
#if VSOMEIP_BOOST_VERSION < 107600
#if BOOST_VERSION < 107600
std::unordered_map<boost::asio::ip::address, std::tuple<bool, bool>, address_hash> observed_hosts;
#else
std::unordered_map<boost::asio::ip::address, std::tuple<bool, bool>> observed_hosts;
Expand Down
3 changes: 2 additions & 1 deletion test/common/src/utility.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.

#include <boost/version.hpp>
#include <common/utility.hpp>

void utility::load_policy_data(std::string _input, std::vector<vsomeip_v3::configuration_element>& _elements,
Expand Down Expand Up @@ -57,7 +58,7 @@ std::set<std::string> utility::get_all_files_in_dir(const std::string& _dir_path
if (boost::filesystem::is_directory(iter->path())
&& (std::find(_dir_skip_list.begin(), _dir_skip_list.end(), iter->path().filename()) != _dir_skip_list.end())) {
// Boost Filesystem API to skip current directory iteration
#if VSOMEIP_BOOST_VERSION < 108100
#if BOOST_VERSION < 108100
iter.no_push();
#else
iter.disable_recursion_pending();
Expand Down