Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-20 00:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ntcore] Remove "using wpi" from nt namespace

Browse Source 
This removes the nt::ArrayRef, nt::StringRef, and nt::Twine aliases.
This commit is contained in:
Peter Johnson
2021-04-04 12:40:46 -07:00
parent 79267f9e60
commit 397e569aaf
34 changed files with 460 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ntcore/src/test/native/cpp/EntryNotifierTest.cpp
View File

@@ -245,7 +245,7 @@ TEST_F(EntryNotifierTest, PollPrefixBasic) {
int g4count = 0;
for (const auto& result : results) {
SCOPED_TRACE(::testing::PrintToString(result));
EXPECT_TRUE(StringRef(result.name).startswith("/foo"));
EXPECT_TRUE(wpi::StringRef(result.name).startswith("/foo"));
EXPECT_THAT(result.value, ValueEq(Value::MakeDouble(1)));
EXPECT_EQ(Handle{result.entry}.GetType(), Handle::kEntry);
EXPECT_EQ(Handle{result.entry}.GetInst(), 1);

2
ntcore/src/test/native/cpp/MockEntryNotifier.h
View File

@@ -30,7 +30,7 @@ class MockEntryNotifier : public IEntryNotifier {
unsigned int(unsigned int poller_uid, unsigned int local_id,
unsigned int flags));
MOCK_METHOD5(NotifyEntry,
void(unsigned int local_id, StringRef name,
void(unsigned int local_id, wpi::StringRef name,
std::shared_ptr<Value> value, unsigned int flags,
unsigned int only_listener));
};

2
ntcore/src/test/native/cpp/MockRpcServer.h
View File

@@ -16,7 +16,7 @@ class MockRpcServer : public IRpcServer {
MOCK_METHOD1(RemoveRpc, void(unsigned int rpc_uid));
MOCK_METHOD7(ProcessRpc,
void(unsigned int local_id, unsigned int call_uid,
StringRef name, StringRef params,
wpi::StringRef name, wpi::StringRef params,
const ConnectionInfo& conn, SendResponseFunc send_response,
unsigned int rpc_uid));
};

1
ntcore/src/test/native/cpp/StorageTest.cpp
View File

@@ -19,6 +19,7 @@ using ::testing::_;
using ::testing::AnyNumber;
using ::testing::IsNull;
using ::testing::Return;
using wpi::StringRef;
namespace nt {

2
ntcore/src/test/native/cpp/StorageTest.h
View File

@@ -24,7 +24,7 @@ class StorageTest {
Storage::EntriesMap& entries() { return storage.m_entries; }
Storage::IdMap& idmap() { return storage.m_idmap; }
Storage::Entry* GetEntry(StringRef name) {
Storage::Entry* GetEntry(wpi::StringRef name) {
auto i = storage.m_entries.find(name);
return i == storage.m_entries.end() ? &tmp_entry : i->getValue();
}