Replace use of std::pair with rdcpair wherever possible

* Only remaining uses in our code is when we're interacting with std::map where
  it uses std::pair internally
This commit is contained in:
baldurk
2019-05-17 14:00:20 +01:00
parent 462772af91
commit e48065c96b
57 changed files with 268 additions and 340 deletions
+5 -5
View File
@@ -354,12 +354,12 @@ bool ReinstallPatchedAPK(const std::string &deviceID, const std::string &apk, co
bool CheckPatchingRequirements()
{
// check for required tools for patching
std::vector<std::pair<ToolDir, std::string>> requirements;
std::vector<rdcpair<ToolDir, std::string>> requirements;
std::vector<std::string> missingTools;
requirements.push_back(std::make_pair(ToolDir::BuildTools, "aapt"));
requirements.push_back(std::make_pair(ToolDir::BuildTools, "zipalign"));
requirements.push_back(std::make_pair(ToolDir::BuildToolsLib, "apksigner.jar"));
requirements.push_back(std::make_pair(ToolDir::Java, "java"));
requirements.push_back({ToolDir::BuildTools, "aapt"});
requirements.push_back({ToolDir::BuildTools, "zipalign"});
requirements.push_back({ToolDir::BuildToolsLib, "apksigner.jar"});
requirements.push_back({ToolDir::Java, "java"});
for(uint32_t i = 0; i < requirements.size(); i++)
{