LSC: Add std:: qualifications to all references to std::string and std::basic_string.
Adding these qualifications will make google3 C++ more portable, allow the global using std::string declarations in the google3 copy of the C++ standard library to be deleted, and bring google3 C++ in line with how the rest of the world uses C++. This completes the work started in go/lsc-add-std and go/std-type-qualification.
LSC documentation: go/lsc-std-string
Tested:
TAP --sample ran all affected tests and none failed
http://test/OCL:296724778:BASE:296722867:1582463671875:a3d40632
PiperOrigin-RevId: 296881080
Change-Id: I8d28fc887055e4cc2bde0608d3beb832d6eb5698
diff --git a/quic/qbone/bonnet/icmp_reachable.cc b/quic/qbone/bonnet/icmp_reachable.cc
index 47cd3ec..c6dd96d 100644
--- a/quic/qbone/bonnet/icmp_reachable.cc
+++ b/quic/qbone/bonnet/icmp_reachable.cc
@@ -143,7 +143,7 @@
QUIC_VLOG(1) << "Received ping response in "
<< absl::ToInt64Microseconds(end_ - start_) << "us.";
- string source;
+ std::string source;
QuicIpAddress source_ip;
if (!source_ip.FromPackedString(
reinterpret_cast<char*>(&source_addr.sin6_addr), sizeof(in6_addr))) {
@@ -208,7 +208,7 @@
eps->UnregisterFD(fd);
}
-string IcmpReachable::EpollCallback::Name() const {
+std::string IcmpReachable::EpollCallback::Name() const {
return "ICMP Reachable";
}
diff --git a/quic/qbone/bonnet/icmp_reachable.h b/quic/qbone/bonnet/icmp_reachable.h
index c9016d6..f58efd0 100644
--- a/quic/qbone/bonnet/icmp_reachable.h
+++ b/quic/qbone/bonnet/icmp_reachable.h
@@ -30,7 +30,7 @@
struct ReachableEvent {
Status status;
absl::Duration response_time;
- string source;
+ std::string source;
};
class StatsInterface {
@@ -105,7 +105,7 @@
void OnShutdown(QuicEpollServer* eps, int fd) override;
- string Name() const override;
+ std::string Name() const override;
private:
IcmpReachable* reachable_;
diff --git a/quic/qbone/bonnet/icmp_reachable_test.cc b/quic/qbone/bonnet/icmp_reachable_test.cc
index 99de19c..fdadeff 100644
--- a/quic/qbone/bonnet/icmp_reachable_test.cc
+++ b/quic/qbone/bonnet/icmp_reachable_test.cc
@@ -65,13 +65,13 @@
int unreachable_count() { return unreachable_count_; }
- string current_source() { return current_source_; }
+ std::string current_source() { return current_source_; }
private:
int reachable_count_ = 0;
int unreachable_count_ = 0;
- string current_source_{};
+ std::string current_source_{};
QuicUnorderedMap<int, int> read_errors_;
QuicUnorderedMap<int, int> write_errors_;
@@ -182,7 +182,7 @@
}));
sockaddr_in6 source_addr{};
- string packed_source = source_.ToPackedString();
+ std::string packed_source = source_.ToPackedString();
memcpy(&source_addr.sin6_addr, packed_source.data(), packed_source.size());
EXPECT_CALL(kernel_, recvfrom(read_fd_, _, _, _, _, _))
diff --git a/quic/qbone/bonnet/mock_packet_exchanger_stats_interface.h b/quic/qbone/bonnet/mock_packet_exchanger_stats_interface.h
index f74e2a3..7814fb3 100644
--- a/quic/qbone/bonnet/mock_packet_exchanger_stats_interface.h
+++ b/quic/qbone/bonnet/mock_packet_exchanger_stats_interface.h
@@ -15,8 +15,8 @@
public:
MOCK_METHOD0(OnPacketRead, void());
MOCK_METHOD0(OnPacketWritten, void());
- MOCK_METHOD1(OnReadError, void(string*));
- MOCK_METHOD1(OnWriteError, void(string*));
+ MOCK_METHOD1(OnReadError, void(std::string*));
+ MOCK_METHOD1(OnWriteError, void(std::string*));
MOCK_CONST_METHOD0(PacketsRead, int64_t());
MOCK_CONST_METHOD0(PacketsWritten, int64_t());
diff --git a/quic/qbone/bonnet/tun_device.cc b/quic/qbone/bonnet/tun_device.cc
index 6fa3cc3..c64e5b9 100644
--- a/quic/qbone/bonnet/tun_device.cc
+++ b/quic/qbone/bonnet/tun_device.cc
@@ -19,7 +19,7 @@
const char kTapTunDevicePath[] = "/dev/net/tun";
const int kInvalidFd = -1;
-TunDevice::TunDevice(const string& interface_name,
+TunDevice::TunDevice(const std::string& interface_name,
int mtu,
bool persist,
bool setup_tun,
diff --git a/quic/qbone/bonnet/tun_device.h b/quic/qbone/bonnet/tun_device.h
index f4b901f..9f76fa6 100644
--- a/quic/qbone/bonnet/tun_device.h
+++ b/quic/qbone/bonnet/tun_device.h
@@ -32,7 +32,7 @@
// routing rules go away.
//
// The caller should own kernel and make sure it outlives this.
- TunDevice(const string& interface_name,
+ TunDevice(const std::string& interface_name,
int mtu,
bool persist,
bool setup_tun,
@@ -70,7 +70,7 @@
// Opens a socket and makes netdevice ioctl call
bool NetdeviceIoctl(int request, void* argp);
- const string interface_name_;
+ const std::string interface_name_;
const int mtu_;
const bool persist_;
const bool setup_tun_;
diff --git a/quic/qbone/bonnet/tun_device_packet_exchanger.cc b/quic/qbone/bonnet/tun_device_packet_exchanger.cc
index c9c9edf..a3f3565 100644
--- a/quic/qbone/bonnet/tun_device_packet_exchanger.cc
+++ b/quic/qbone/bonnet/tun_device_packet_exchanger.cc
@@ -26,7 +26,7 @@
bool TunDevicePacketExchanger::WritePacket(const char* packet,
size_t size,
bool* blocked,
- string* error) {
+ std::string* error) {
*blocked = false;
if (fd_ < 0) {
*error = quiche::QuicheStrCat("Invalid file descriptor of the TUN device: ",
@@ -53,8 +53,9 @@
return true;
}
-std::unique_ptr<QuicData> TunDevicePacketExchanger::ReadPacket(bool* blocked,
- string* error) {
+std::unique_ptr<QuicData> TunDevicePacketExchanger::ReadPacket(
+ bool* blocked,
+ std::string* error) {
*blocked = false;
if (fd_ < 0) {
*error = quiche::QuicheStrCat("Invalid file descriptor of the TUN device: ",
diff --git a/quic/qbone/bonnet/tun_device_packet_exchanger.h b/quic/qbone/bonnet/tun_device_packet_exchanger.h
index 42ed7fb..c909f7d 100644
--- a/quic/qbone/bonnet/tun_device_packet_exchanger.h
+++ b/quic/qbone/bonnet/tun_device_packet_exchanger.h
@@ -28,8 +28,8 @@
virtual void OnPacketRead() = 0;
virtual void OnPacketWritten() = 0;
- virtual void OnReadError(string* error) = 0;
- virtual void OnWriteError(string* error) = 0;
+ virtual void OnReadError(std::string* error) = 0;
+ virtual void OnWriteError(std::string* error) = 0;
ABSL_MUST_USE_RESULT virtual int64_t PacketsRead() const = 0;
ABSL_MUST_USE_RESULT virtual int64_t PacketsWritten() const = 0;
@@ -57,13 +57,14 @@
private:
// From QbonePacketExchanger.
- std::unique_ptr<QuicData> ReadPacket(bool* blocked, string* error) override;
+ std::unique_ptr<QuicData> ReadPacket(bool* blocked,
+ std::string* error) override;
// From QbonePacketExchanger.
bool WritePacket(const char* packet,
size_t size,
bool* blocked,
- string* error) override;
+ std::string* error) override;
int fd_ = -1;
size_t mtu_;
diff --git a/quic/qbone/bonnet/tun_device_packet_exchanger_test.cc b/quic/qbone/bonnet/tun_device_packet_exchanger_test.cc
index 0f25e73..8b4695c 100644
--- a/quic/qbone/bonnet/tun_device_packet_exchanger_test.cc
+++ b/quic/qbone/bonnet/tun_device_packet_exchanger_test.cc
@@ -23,8 +23,8 @@
class MockVisitor : public QbonePacketExchanger::Visitor {
public:
- MOCK_METHOD1(OnReadError, void(const string&));
- MOCK_METHOD1(OnWriteError, void(const string&));
+ MOCK_METHOD1(OnReadError, void(const std::string&));
+ MOCK_METHOD1(OnWriteError, void(const std::string&));
};
class TunDevicePacketExchangerTest : public QuicTest {
@@ -47,7 +47,7 @@
};
TEST_F(TunDevicePacketExchangerTest, WritePacketReturnsFalseOnError) {
- string packet = "fake packet";
+ std::string packet = "fake packet";
EXPECT_CALL(mock_kernel_, write(kFd, _, packet.size()))
.WillOnce(Invoke([](int fd, const void* buf, size_t count) {
errno = ECOMM;
@@ -60,7 +60,7 @@
TEST_F(TunDevicePacketExchangerTest,
WritePacketReturnFalseAndBlockedOnBlockedTunnel) {
- string packet = "fake packet";
+ std::string packet = "fake packet";
EXPECT_CALL(mock_kernel_, write(kFd, _, packet.size()))
.WillOnce(Invoke([](int fd, const void* buf, size_t count) {
errno = EAGAIN;
@@ -72,7 +72,7 @@
}
TEST_F(TunDevicePacketExchangerTest, WritePacketReturnsTrueOnSuccessfulWrite) {
- string packet = "fake packet";
+ std::string packet = "fake packet";
EXPECT_CALL(mock_kernel_, write(kFd, _, packet.size()))
.WillOnce(Invoke([packet](int fd, const void* buf, size_t count) {
EXPECT_THAT(reinterpret_cast<const char*>(buf), StrEq(packet));
@@ -105,7 +105,7 @@
TEST_F(TunDevicePacketExchangerTest,
ReadPacketReturnsThePacketOnSuccessfulRead) {
- string packet = "fake_packet";
+ std::string packet = "fake_packet";
EXPECT_CALL(mock_kernel_, read(kFd, _, kMtu))
.WillOnce(Invoke([packet](int fd, void* buf, size_t count) {
memcpy(buf, packet.data(), packet.size());
