Unverified Commit 9e130954 authored by Dominik Charousset's avatar Dominik Charousset Committed by GitHub

Merge pull request #1328

Remove overlooked use of deprecated APIs
parents 4d087d00 1dece448
...@@ -49,14 +49,15 @@ struct fixture { ...@@ -49,14 +49,15 @@ struct fixture {
} }
template <class T> template <class T>
optional<T> get(const settings& cfg, std::string_view key) { std::optional<T> get(const settings& cfg, std::string_view key) {
if (auto ptr = get_if<T>(&cfg, key)) if (auto ptr = get_if<T>(&cfg, key))
return *ptr; return *ptr;
return none; else
return {};
} }
template <class T> template <class T>
optional<T> get(std::string_view key) { std::optional<T> get(std::string_view key) {
if (auto* xs = get_if<settings>(&x)) if (auto* xs = get_if<settings>(&x))
return get<T>(*xs, key); return get<T>(*xs, key);
else else
......
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
#include "caf/telemetry/metric_type.hpp" #include "caf/telemetry/metric_type.hpp"
using namespace caf; using namespace caf;
using namespace caf::literals;
using namespace caf::telemetry; using namespace caf::telemetry;
using namespace std::literals; using namespace std::literals;
...@@ -64,7 +63,7 @@ some_request_duration_seconds_bucket{x="get",le="4"} 2 42000 ...@@ -64,7 +63,7 @@ some_request_duration_seconds_bucket{x="get",le="4"} 2 42000
some_request_duration_seconds_bucket{x="get",le="+Inf"} 3 42000 some_request_duration_seconds_bucket{x="get",le="+Inf"} 3 42000
some_request_duration_seconds_sum{x="get"} 14 42000 some_request_duration_seconds_sum{x="get"} 14 42000
some_request_duration_seconds_count{x="get"} 3 42000 some_request_duration_seconds_count{x="get"} 3 42000
)"_sv); )"sv);
MESSAGE("multiple runs with the same timestamp generate the same output"); MESSAGE("multiple runs with the same timestamp generate the same output");
auto ts = make_timestamp(); auto ts = make_timestamp();
std::string res1; std::string res1;
......
...@@ -27,12 +27,12 @@ namespace { ...@@ -27,12 +27,12 @@ namespace {
// check invariants of type system // check invariants of type system
using dummy1 = typed_actor<result<void>(int, int), result<double>(double)>; using dummy1 = typed_actor<result<void>(int, int), result<double>(double)>;
using dummy2 = dummy1::extend<reacts_to<ok_atom>>; using dummy2 = dummy1::extend<result<void>(ok_atom)>;
static_assert(std::is_convertible<dummy2, dummy1>::value, static_assert(std::is_convertible<dummy2, dummy1>::value,
"handle not assignable to narrower definition"); "handle not assignable to narrower definition");
using dummy3 = typed_actor<reacts_to<float, int>>; using dummy3 = typed_actor<result<void>(float, int)>;
using dummy4 = typed_actor<result<double>(int)>; using dummy4 = typed_actor<result<double>(int)>;
using dummy5 = dummy4::extend_with<dummy3>; using dummy5 = dummy4::extend_with<dummy3>;
...@@ -345,7 +345,7 @@ CAF_TEST(sending_typed_actors_and_down_msg) { ...@@ -345,7 +345,7 @@ CAF_TEST(sending_typed_actors_and_down_msg) {
CAF_TEST(check_signature) { CAF_TEST(check_signature) {
using foo_type = typed_actor<result<ok_atom>(put_atom)>; using foo_type = typed_actor<result<ok_atom>(put_atom)>;
using foo_result_type = result<ok_atom>; using foo_result_type = result<ok_atom>;
using bar_type = typed_actor<reacts_to<ok_atom>>; using bar_type = typed_actor<result<void>(ok_atom)>;
auto foo_action = [](foo_type::pointer ptr) -> foo_type::behavior_type { auto foo_action = [](foo_type::pointer ptr) -> foo_type::behavior_type {
return { return {
[=](put_atom) -> foo_result_type { [=](put_atom) -> foo_result_type {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment