TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-14 22:56:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Switch to absl::variant for Chrome compatibility

Browse Source 
PiperOrigin-RevId: 467033120
This commit is contained in:
Anay Wadhera
2022-08-11 13:21:52 -07:00
committed by Copybara-Service
parent 754b1ad349
commit e1f8cf40ba
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
presence/implementation/advertisement_factory.cc
+3 -3
View File
@@ -15,10 +15,10 @@
#include "presence/implementation/advertisement_factory.h"
#include <string>
#include <variant>
#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<BleAdvertisementData> AdvertisementFactory::CreateAdvertisement(
const BaseBroadcastRequest& request) const {
BleAdvertisementData advert = {};
if (std::holds_alternative<BaseBroadcastRequest::BasePresence>(
if (absl::holds_alternative<BaseBroadcastRequest::BasePresence>(
request.variant)) {
return CreateBaseNpAdvertisement(request);
}
@@ -84,7 +84,7 @@ absl::StatusOr<BleAdvertisementData>
AdvertisementFactory::CreateBaseNpAdvertisement(
const BaseBroadcastRequest& request) const {
const auto& presence =
std::get<BaseBroadcastRequest::BasePresence>(request.variant);
absl::get<BaseBroadcastRequest::BasePresence>(request.variant);
BleAdvertisementData advert{};
std::string payload;
payload.push_back(kBaseVersion);
presence/implementation/base_broadcast_request.h
+2 -3
View File
@@ -18,7 +18,6 @@
#include <stdint.h>
#include <string>
#include <variant>
#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<Discoverable, Nondiscoverable> advertisement;
absl::variant<Discoverable, Nondiscoverable> advertisement;
};
struct BaseEddystone {
std::string ephemeral_id;
};
std::variant<BasePresence, BaseFastPair, BaseEddystone> variant;
absl::variant<BasePresence, BaseFastPair, BaseEddystone> variant;
std::string salt;
int8_t tx_power;
unsigned int interval_ms;
presence/implementation/base_broadcast_request_test.cc
+1 -3
View File
@@ -14,8 +14,6 @@
#include "presence/implementation/base_broadcast_request.h"
#include <variant>
#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<BaseBroadcastRequest::BasePresence>(
EXPECT_TRUE(absl::holds_alternative<BaseBroadcastRequest::BasePresence>(
request.variant));
EXPECT_EQ(request.salt.size(), 2);
EXPECT_EQ(request.tx_power, kTxPower);