diff --git a/presence/implementation/advertisement_factory.cc b/presence/implementation/advertisement_factory.cc index d2aac054..b8e520de 100644 --- a/presence/implementation/advertisement_factory.cc +++ b/presence/implementation/advertisement_factory.cc @@ -15,10 +15,10 @@ #include "presence/implementation/advertisement_factory.h" #include -#include #include "absl/status/status.h" #include "absl/strings/str_format.h" +#include "absl/types/variant.h" #include "internal/platform/logging.h" #include "internal/platform/uuid.h" #include "presence/data_element.h" @@ -73,7 +73,7 @@ uint8_t GetIdentityFieldType(PresenceIdentity::IdentityType type) { absl::StatusOr AdvertisementFactory::CreateAdvertisement( const BaseBroadcastRequest& request) const { BleAdvertisementData advert = {}; - if (std::holds_alternative( + if (absl::holds_alternative( request.variant)) { return CreateBaseNpAdvertisement(request); } @@ -84,7 +84,7 @@ absl::StatusOr AdvertisementFactory::CreateBaseNpAdvertisement( const BaseBroadcastRequest& request) const { const auto& presence = - std::get(request.variant); + absl::get(request.variant); BleAdvertisementData advert{}; std::string payload; payload.push_back(kBaseVersion); diff --git a/presence/implementation/base_broadcast_request.h b/presence/implementation/base_broadcast_request.h index a08c1466..b1f44315 100644 --- a/presence/implementation/base_broadcast_request.h +++ b/presence/implementation/base_broadcast_request.h @@ -18,7 +18,6 @@ #include #include -#include #include "absl/strings/string_view.h" #include "absl/types/variant.h" @@ -48,12 +47,12 @@ struct BaseBroadcastRequest { std::string account_key_data; std::string battery_info; }; - std::variant advertisement; + absl::variant advertisement; }; struct BaseEddystone { std::string ephemeral_id; }; - std::variant variant; + absl::variant variant; std::string salt; int8_t tx_power; unsigned int interval_ms; diff --git a/presence/implementation/base_broadcast_request_test.cc b/presence/implementation/base_broadcast_request_test.cc index 38b0791d..3444350a 100644 --- a/presence/implementation/base_broadcast_request_test.cc +++ b/presence/implementation/base_broadcast_request_test.cc @@ -14,8 +14,6 @@ #include "presence/implementation/base_broadcast_request.h" -#include - #include "gmock/gmock.h" #include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" @@ -32,7 +30,7 @@ TEST(BroadcastRequestTest, CreateBasePresenceRequest) { BaseBroadcastRequest request = BaseBroadcastRequest( BasePresenceRequestBuilder(identity).SetTxPower(kTxPower)); - EXPECT_TRUE(std::holds_alternative( + EXPECT_TRUE(absl::holds_alternative( request.variant)); EXPECT_EQ(request.salt.size(), 2); EXPECT_EQ(request.tx_power, kTxPower);