Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-23 01:21: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

8
ntcore/src/main/native/cpp/jni/NetworkTablesJNI.cpp
View File

@@ -1549,7 +1549,7 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_startClient__I_3Ljava_lang_Str
}
std::vector<std::string> names;
std::vector<std::pair<nt::StringRef, unsigned int>> servers;
std::vector<std::pair<wpi::StringRef, unsigned int>> servers;
names.reserve(len);
servers.reserve(len);
for (int i = 0; i < len; ++i) {
@@ -1561,7 +1561,7 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_startClient__I_3Ljava_lang_Str
}
names.emplace_back(JStringRef{env, elem}.str());
servers.emplace_back(
std::make_pair(nt::StringRef(names.back()), portInts[i]));
std::make_pair(wpi::StringRef(names.back()), portInts[i]));
}
env->ReleaseIntArrayElements(ports, portInts, JNI_ABORT);
nt::StartClient(inst, servers);
@@ -1636,7 +1636,7 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_setServer__I_3Ljava_lang_Strin
}
std::vector<std::string> names;
std::vector<std::pair<nt::StringRef, unsigned int>> servers;
std::vector<std::pair<wpi::StringRef, unsigned int>> servers;
names.reserve(len);
servers.reserve(len);
for (int i = 0; i < len; ++i) {
@@ -1648,7 +1648,7 @@ Java_edu_wpi_first_networktables_NetworkTablesJNI_setServer__I_3Ljava_lang_Strin
}
names.emplace_back(JStringRef{env, elem}.str());
servers.emplace_back(
std::make_pair(nt::StringRef(names.back()), portInts[i]));
std::make_pair(wpi::StringRef(names.back()), portInts[i]));
}
env->ReleaseIntArrayElements(ports, portInts, JNI_ABORT);
nt::SetServer(inst, servers);