summaryrefslogtreecommitdiff
path: root/redfish-core
diff options
context:
space:
mode:
authorEd Tanous <edtanous@google.com>2023-10-04 19:40:14 +0300
committerEd Tanous <edtanous@google.com>2023-10-05 02:47:00 +0300
commit6fd295531d34a3f1df887200ad904321b6020ddd (patch)
treebaaa1f7b67d0c53df4e4a80bc59fad9d095fc5a2 /redfish-core
parentb8ad583f70f3f4acb9fb3883857a5f8d7af29fd3 (diff)
downloadbmcweb-6fd295531d34a3f1df887200ad904321b6020ddd.tar.xz
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 <edtanous@google.com>
Diffstat (limited to 'redfish-core')
-rw-r--r--redfish-core/include/event_service_manager.hpp2
-rw-r--r--redfish-core/include/redfish_aggregator.hpp2
-rw-r--r--redfish-core/include/utils/telemetry_utils.hpp2
-rw-r--r--redfish-core/lib/certificate_service.hpp2
-rw-r--r--redfish-core/lib/ethernet.hpp2
-rw-r--r--redfish-core/lib/event_service.hpp2
-rw-r--r--redfish-core/lib/trigger.hpp4
-rw-r--r--redfish-core/lib/virtual_media.hpp4
8 files changed, 10 insertions, 10 deletions
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<persistent_data::UserSubscription> newSub =
it.second;
- boost::urls::result<boost::urls::url> url =
+ boost::system::result<boost::urls::url> 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<boost::urls::url_view> parsedUrl =
+ boost::system::result<boost::urls::url_view> 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<IncorrectMetricUri> getChassisSensorNode(
size_t uriIdx = 0;
for (const std::string& uri : uris)
{
- boost::urls::result<boost::urls::url_view> parsed =
+ boost::system::result<boost::urls::url_view> parsed =
boost::urls::parse_relative_ref(uri);
if (!parsed)
diff --git a/redfish-core/lib/certificate_service.hpp b/redfish-core/lib/certificate_service.hpp
index 44005966c7..10931c4f47 100644
--- a/redfish-core/lib/certificate_service.hpp
+++ b/redfish-core/lib/certificate_service.hpp
@@ -505,7 +505,7 @@ inline void handleReplaceCertificateAction(
}
BMCWEB_LOG_INFO("Certificate URI to replace: {}", certURI);
- boost::urls::result<boost::urls::url> parsedUrl =
+ boost::system::result<boost::urls::url> parsedUrl =
boost::urls::parse_relative_ref(certURI);
if (!parsedUrl)
{
diff --git a/redfish-core/lib/ethernet.hpp b/redfish-core/lib/ethernet.hpp
index 0f35f7ed06..bd446771cb 100644
--- a/redfish-core/lib/ethernet.hpp
+++ b/redfish-core/lib/ethernet.hpp
@@ -1872,7 +1872,7 @@ inline void requestEthernetInterfacesRoutes(App& app)
}
BMCWEB_LOG_INFO("Parent Interface URI: {}", parentInterfaceUri);
- boost::urls::result<boost::urls::url_view> parsedUri =
+ boost::system::result<boost::urls::url_view> parsedUri =
boost::urls::parse_relative_ref(parentInterfaceUri);
if (!parsedUri)
{
diff --git a/redfish-core/lib/event_service.hpp b/redfish-core/lib/event_service.hpp
index 89c233702f..c1ad0d8022 100644
--- a/redfish-core/lib/event_service.hpp
+++ b/redfish-core/lib/event_service.hpp
@@ -318,7 +318,7 @@ inline void requestRoutesEventDestinationCollection(App& app)
}
}
- boost::urls::result<boost::urls::url> url =
+ boost::system::result<boost::urls::url> url =
boost::urls::parse_absolute_uri(destUrl);
if (!url)
{
diff --git a/redfish-core/lib/trigger.hpp b/redfish-core/lib/trigger.hpp
index 48e348ec60..3388580cdc 100644
--- a/redfish-core/lib/trigger.hpp
+++ b/redfish-core/lib/trigger.hpp
@@ -246,7 +246,7 @@ struct Context
inline std::optional<sdbusplus::message::object_path>
getReportPathFromReportDefinitionUri(const std::string& uri)
{
- boost::urls::result<boost::urls::url_view> parsed =
+ boost::system::result<boost::urls::url_view> parsed =
boost::urls::parse_relative_ref(uri);
if (!parsed)
@@ -543,7 +543,7 @@ inline bool parseMetricProperties(crow::Response& res, Context& ctx)
size_t uriIdx = 0;
for (const std::string& uriStr : *ctx.metricProperties)
{
- boost::urls::result<boost::urls::url_view> uri =
+ boost::system::result<boost::urls::url_view> uri =
boost::urls::parse_relative_ref(uriStr);
if (!uri)
{
diff --git a/redfish-core/lib/virtual_media.hpp b/redfish-core/lib/virtual_media.hpp
index d854ee53b6..95cbdf146f 100644
--- a/redfish-core/lib/virtual_media.hpp
+++ b/redfish-core/lib/virtual_media.hpp
@@ -128,7 +128,7 @@ inline void
*/
inline std::string getTransferProtocolTypeFromUri(const std::string& imageUri)
{
- boost::urls::result<boost::urls::url_view> url =
+ boost::system::result<boost::urls::url_view> url =
boost::urls::parse_uri(imageUri);
if (!url)
{
@@ -553,7 +553,7 @@ inline void validateParams(const std::shared_ptr<bmcweb::AsyncResp>& asyncResp,
return;
}
- boost::urls::result<boost::urls::url_view> url =
+ boost::system::result<boost::urls::url_view> url =
boost::urls::parse_uri(*actionParams.imageUrl);
if (!url)
{