From 6fd295531d34a3f1df887200ad904321b6020ddd Mon Sep 17 00:00:00 2001 From: Ed Tanous Date: Wed, 4 Oct 2023 09:40:14 -0700 Subject: Update to boost 1.83.0 In boost 1.83.0, the boost::url maintainers deprecated the header only usage of the library without warning. A discussion with the maintainers[1] made it clear that they removed the abiliy on purpose, and they're not going to add it back or add a deprecation strategy (they did say they would update the documentation to actually match the intent), and that from here on in we should be using the cmake boost project to pull in the non-header-only boost libraries we use (which at this point is ONLY boost url). This commit updates to remove the usage of boost::urls::result typedef, which was deprecated in this release (which causes a compile error) and moves it to boost::system::result. In addition, it updates our meson files to pull in the boost project as a cmake dependency. [1] https://cpplang.slack.com/archives/C01JR6C9C4U/p1696441238739129 Tested: Not yet. Change-Id: Ia7adfc0348588915440687c3ab83a1de3e6b845a Signed-off-by: Ed Tanous --- redfish-core/include/event_service_manager.hpp | 2 +- redfish-core/include/redfish_aggregator.hpp | 2 +- redfish-core/include/utils/telemetry_utils.hpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'redfish-core/include') diff --git a/redfish-core/include/event_service_manager.hpp b/redfish-core/include/event_service_manager.hpp index ed02c409eb..5ea30df8ee 100644 --- a/redfish-core/include/event_service_manager.hpp +++ b/redfish-core/include/event_service_manager.hpp @@ -642,7 +642,7 @@ class EventServiceManager std::shared_ptr newSub = it.second; - boost::urls::result url = + boost::system::result url = boost::urls::parse_absolute_uri(newSub->destinationUrl); if (!url) diff --git a/redfish-core/include/redfish_aggregator.hpp b/redfish-core/include/redfish_aggregator.hpp index e5ad88abe1..5df43a6b36 100644 --- a/redfish-core/include/redfish_aggregator.hpp +++ b/redfish-core/include/redfish_aggregator.hpp @@ -80,7 +80,7 @@ inline bool searchCollectionsArray(std::string_view uri, parseCount--; } - boost::urls::result parsedUrl = + boost::system::result parsedUrl = boost::urls::parse_relative_ref( uri.substr(serviceRootUri.size(), parseCount)); if (!parsedUrl) diff --git a/redfish-core/include/utils/telemetry_utils.hpp b/redfish-core/include/utils/telemetry_utils.hpp index c5c88fa4e5..ac1411c7d7 100644 --- a/redfish-core/include/utils/telemetry_utils.hpp +++ b/redfish-core/include/utils/telemetry_utils.hpp @@ -66,7 +66,7 @@ inline std::optional getChassisSensorNode( size_t uriIdx = 0; for (const std::string& uri : uris) { - boost::urls::result parsed = + boost::system::result parsed = boost::urls::parse_relative_ref(uri); if (!parsed) -- cgit v1.2.3