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

Convert std::variant usage to absl::variant

Browse Source 
PiperOrigin-RevId: 546987633
This commit is contained in:
Crisrael Lucero
2023-07-10 14:43:27 -07:00
committed by Copybara-Service
parent 07384669f2
commit 001069faa1
4 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
connections/v3/BUILD
+1
View File
@@ -25,6 +25,7 @@ cc_library(
"//proto:connections_enums_cc_proto",
"@com_google_absl//absl/functional:any_invocable",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/types:variant",
],
)
connections/v3/connections_device.cc
+8 -8
View File
@@ -15,9 +15,9 @@
#include "connections/v3/connections_device.h"
#include <string>
#include <variant>
#include "absl/strings/str_cat.h"
#include "absl/types/variant.h"
#include "connections/implementation/proto/offline_wire_formats.pb.h"
#include "internal/platform/ble_connection_info.h"
#include "internal/platform/bluetooth_connection_info.h"
@@ -31,22 +31,22 @@ std::string ConnectionsDevice::ToProtoBytes() const {
// Bytes holding the connection info data elements.
std::string connection_info_string;
for (const auto& connection_info : connection_infos_) {
if (std::holds_alternative<absl::monostate>(connection_info)) {
if (absl::holds_alternative<absl::monostate>(connection_info)) {
continue;
}
if (std::holds_alternative<BleConnectionInfo>(connection_info)) {
if (absl::holds_alternative<BleConnectionInfo>(connection_info)) {
absl::StrAppend(
&connection_info_string,
std::get<BleConnectionInfo>(connection_info).ToDataElementBytes());
absl::get<BleConnectionInfo>(connection_info).ToDataElementBytes());
}
if (std::holds_alternative<WifiLanConnectionInfo>(connection_info)) {
if (absl::holds_alternative<WifiLanConnectionInfo>(connection_info)) {
absl::StrAppend(&connection_info_string,
std::get<WifiLanConnectionInfo>(connection_info)
absl::get<WifiLanConnectionInfo>(connection_info)
.ToDataElementBytes());
}
if (std::holds_alternative<BluetoothConnectionInfo>(connection_info)) {
if (absl::holds_alternative<BluetoothConnectionInfo>(connection_info)) {
absl::StrAppend(&connection_info_string,
std::get<BluetoothConnectionInfo>(connection_info)
absl::get<BluetoothConnectionInfo>(connection_info)
.ToDataElementBytes());
}
}
presence/BUILD
+1
View File
@@ -36,6 +36,7 @@ cc_library(
"//presence/implementation:internal", # build_cleaner: keep
"@com_google_absl//absl/status",
"@com_google_absl//absl/status:statusor",
"@com_google_absl//absl/types:variant",
],
)
presence/presence_device.cc
+9 -8
View File
@@ -15,9 +15,9 @@
#include "presence/presence_device.h"
#include <string>
#include <variant>
#include <vector>
#include "absl/types/variant.h"
#include "connections/implementation/proto/offline_wire_formats.pb.h"
#include "internal/interop/device.h"
#include "internal/platform/ble_connection_info.h"
@@ -139,19 +139,20 @@ std::string PresenceDevice::ToProtoBytes() const {
}
std::string connection_infos = "";
for (const auto& connection_info : GetConnectionInfos()) {
if (std::holds_alternative<absl::monostate>(connection_info)) {
if (absl::holds_alternative<absl::monostate>(connection_info)) {
continue;
}
if (std::holds_alternative<BleConnectionInfo>(connection_info)) {
if (absl::holds_alternative<BleConnectionInfo>(connection_info)) {
connection_infos +=
std::get<BleConnectionInfo>(connection_info).ToDataElementBytes();
absl::get<BleConnectionInfo>(connection_info).ToDataElementBytes();
}
if (std::holds_alternative<WifiLanConnectionInfo>(connection_info)) {
if (absl::holds_alternative<WifiLanConnectionInfo>(connection_info)) {
connection_infos +=
std::get<WifiLanConnectionInfo>(connection_info).ToDataElementBytes();
absl::get<WifiLanConnectionInfo>(connection_info)
.ToDataElementBytes();
}
if (std::holds_alternative<BluetoothConnectionInfo>(connection_info)) {
connection_infos += std::get<BluetoothConnectionInfo>(connection_info)
if (absl::holds_alternative<BluetoothConnectionInfo>(connection_info)) {
connection_infos += absl::get<BluetoothConnectionInfo>(connection_info)
.ToDataElementBytes();
}
}