Skip to content

Commit 868e9a6

Browse files
authored
fix: Fix compilation with boost 1.82. (#157)
1 parent ce9b404 commit 868e9a6

File tree

11 files changed

+26
-8
lines changed

11 files changed

+26
-8
lines changed

.github/actions/install-boost/action.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ runs:
3232
shell: bash
3333
run: |
3434
choco install boost-msvc-14.3 -y
35-
echo "BOOST_ROOT=C:\local\boost_1_81_0" >> $GITHUB_OUTPUT
35+
echo "BOOST_ROOT=C:\local\boost_1_82_0" >> $GITHUB_OUTPUT
3636
3737
- name: Install boost using homebrew
3838
id: brew-action
3939
if: runner.os == 'macOS'
4040
shell: bash
4141
run: |
42-
brew install boost@1.81
43-
echo "BOOST_ROOT=$(boost --prefix boost@1.81)" >> $GITHUB_OUTPUT
42+
brew install boost
43+
echo "BOOST_ROOT=$(boost --prefix boost@1.82)" >> $GITHUB_OUTPUT
4444
4545
- name: Determine root
4646
id: determine-root

contract-tests/sdk-contract-tests/src/client_entity.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#include "client_entity.hpp"
2+
3+
#include <boost/core/ignore_unused.hpp>
24
#include <boost/json.hpp>
35

46
#include <launchdarkly/context_builder.hpp>

libs/client-sdk/src/data_sources/data_source_event_handler.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55
#include <launchdarkly/serialization/json_evaluation_result.hpp>
66
#include <launchdarkly/serialization/value_mapping.hpp>
77

8+
#include <boost/core/ignore_unused.hpp>
89
#include <boost/json.hpp>
910
#include <unordered_map>
11+
1012
#include <utility>
1113

1214
#include "tl/expected.hpp"
@@ -144,7 +146,7 @@ DataSourceEventHandler::MessageStatus DataSourceEventHandler::HandleMessage(
144146
boost::json::parse(data));
145147
if (res.has_value()) {
146148
handler_.Upsert(context_, res.value().key,
147-
ItemDescriptor(res.value().version));
149+
ItemDescriptor(res.value().version));
148150
return DataSourceEventHandler::MessageStatus::kMessageHandled;
149151
}
150152
LD_LOG(logger_, LogLevel::kError) << kErrorDeleteInvalid;

libs/internal/include/launchdarkly/network/asio_requester.hpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include <boost/beast/http.hpp>
99
#include <boost/beast/ssl.hpp>
1010
#include <boost/beast/version.hpp>
11+
#include <boost/core/ignore_unused.hpp>
1112

1213
#include "foxy/client_session.hpp"
1314

@@ -148,8 +149,8 @@ class FoxyClient
148149
response_timeout_(response_timeout),
149150
handler_(std::move(handler)),
150151
session_(exec,
151-
launchdarkly::foxy::session_opts{ToOptRef(ssl_context_.get()),
152-
connect_timeout_}),
152+
launchdarkly::foxy::session_opts{
153+
ToOptRef(ssl_context_.get()), connect_timeout_}),
153154
resp_() {}
154155

155156
void Run() {

libs/internal/include/launchdarkly/serialization/value_mapping.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#pragma once
22

3+
#include <boost/core/ignore_unused.hpp>
34
#include <boost/json.hpp>
45

56
namespace launchdarkly {

libs/internal/src/events/asio_event_processor.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#include <boost/asio/post.hpp>
22
#include <boost/asio/strand.hpp>
33
#include <boost/beast/http.hpp>
4+
#include <boost/core/ignore_unused.hpp>
45
#include <boost/lexical_cast.hpp>
56
#include <boost/uuid/uuid_io.hpp>
67

libs/internal/src/serialization/json_attributes.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#include <launchdarkly/serialization/json_attributes.hpp>
22
#include <launchdarkly/serialization/json_value.hpp>
33

4+
#include <boost/core/ignore_unused.hpp>
5+
46
namespace launchdarkly {
57
void tag_invoke(boost::json::value_from_tag const& unused,
68
boost::json::value& json_value,

libs/internal/src/serialization/json_context.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
#include <optional>
77

8+
#include <boost/core/ignore_unused.hpp>
9+
810
namespace launchdarkly {
911
void tag_invoke(boost::json::value_from_tag const&,
1012
boost::json::value& json_value,

libs/internal/src/serialization/json_evaluation_reason.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#include <launchdarkly/serialization/json_evaluation_reason.hpp>
22
#include <launchdarkly/serialization/value_mapping.hpp>
33

4+
#include <boost/core/ignore_unused.hpp>
5+
46
#include <sstream>
57

68
namespace launchdarkly {
@@ -61,8 +63,8 @@ void tag_invoke(boost::json::value_from_tag const& unused,
6163
}
6264

6365
tl::expected<enum EvaluationReason::ErrorKind, JsonError> tag_invoke(
64-
boost::json::value_to_tag<
65-
tl::expected<enum EvaluationReason::ErrorKind, JsonError>> const& unused,
66+
boost::json::value_to_tag<tl::expected<enum EvaluationReason::ErrorKind,
67+
JsonError>> const& unused,
6668
boost::json::value const& json_value) {
6769
if (!json_value.is_string()) {
6870
return tl::unexpected(JsonError::kSchemaFailure);

libs/server-sent-events/src/client.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#include <boost/asio/steady_timer.hpp>
33
#include <boost/asio/strand.hpp>
44
#include <boost/asio/use_future.hpp>
5+
56
#include <foxy/client_session.hpp>
67
#include <launchdarkly/sse/client.hpp>
78

@@ -13,8 +14,11 @@
1314
#include <boost/beast/ssl/ssl_stream.hpp>
1415
#include <boost/beast/version.hpp>
1516

17+
#include <boost/core/ignore_unused.hpp>
18+
1619
#include <boost/url/parse.hpp>
1720
#include <boost/url/url.hpp>
21+
1822
#include <chrono>
1923
#include <iostream>
2024
#include <memory>

libs/server-sent-events/src/parser.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include <boost/beast/http/fields.hpp>
88
#include <boost/beast/http/message.hpp>
99
#include <boost/beast/http/type_traits.hpp>
10+
#include <boost/core/ignore_unused.hpp>
1011

1112
#include <deque>
1213
#include <iostream>

0 commit comments

Comments
 (0)