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

Replace std::make_pair with std::pair CTAD (#7405)

Browse Source
This commit is contained in:
Tyler Veness
2024-11-17 20:29:23 -08:00
committed by GitHub
parent b4bec566f0
commit a04c40f589
18 changed files with 64 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1305,7 +1305,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(std::string_view{names.back()}, portInts[i]));
std::pair{std::string_view{names.back()}, portInts[i]});
}
nt::SetServer(inst, servers);
}

2
ntcore/src/main/native/cpp/networktables/NetworkTable.cpp
View File

@@ -425,7 +425,7 @@ NT_Listener NetworkTable::AddSubTableListener(SubTableListener listener) {
if (notified_tables->find(sub_table_key) != notified_tables->end()) {
return;
}
notified_tables->insert(std::make_pair(sub_table_key, '\0'));
notified_tables->insert(std::pair{sub_table_key, '\0'});
cb(this, sub_table_key, this->GetSubTable(sub_table_key));
});
}

2
ntcore/src/main/native/cpp/ntcore_c.cpp
View File

@@ -561,7 +561,7 @@ void NT_SetServerMulti(NT_Inst inst, size_t count,
servers.reserve(count);
for (size_t i = 0; i < count; ++i) {
servers.emplace_back(
std::make_pair(wpi::to_string_view(&server_names[i]), ports[i]));
std::pair{wpi::to_string_view(&server_names[i]), ports[i]});
}
nt::SetServer(inst, servers);
}