From e131f0fcc319e9e5bd540f01bf3a3343b923d82b Mon Sep 17 00:00:00 2001
From: Jason Hiser <jdhiser@gmail.com>
Date: Wed, 29 May 2019 11:32:25 -0400
Subject: [PATCH] dealt with non-data pointers to scoops for extending elfdeps
---
irdb-libs/libIRDB-elfdep/src/elfdep.cpp | 21 ++++++---------------
1 file changed, 6 insertions(+), 15 deletions(-)
diff --git a/irdb-libs/libIRDB-elfdep/src/elfdep.cpp b/irdb-libs/libIRDB-elfdep/src/elfdep.cpp
index 7a58967fc..f8971be94 100644
--- a/irdb-libs/libIRDB-elfdep/src/elfdep.cpp
+++ b/irdb-libs/libIRDB-elfdep/src/elfdep.cpp
@@ -91,27 +91,18 @@ static void insert_into_scoop_at(const string &str, IRDB_SDK::DataScoop_t* scoop
scoop->getEnd()->setVirtualOffset(newend);
// update each reloc to point to the new location.
- for_each(scoop->getRelocations().begin(), scoop->getRelocations().end(), [str,at](IRDB_SDK::Relocation_t* reloc)
+ for(auto reloc : scoop->getRelocations())
{
if((unsigned int)reloc->getOffset()>=at)
reloc->setOffset(reloc->getOffset()+str.size());
- });
-
- // check relocations for pointers to this object.
- // we'll update dataptr_to_scoop relocs, but nothing else
- // so assert if we find something else
- for_each(firp->getRelocations().begin(), firp->getRelocations().end(), [scoop](IRDB_SDK::Relocation_t* reloc)
- {
- auto wrt=dynamic_cast<IRDB_SDK::DataScoop_t*>(reloc->getWRT());
- assert(wrt != scoop || reloc->getType()=="dataptr_to_scoop");
- });
+ };
// for each scoop
- for_each(firp->getDataScoops().begin(), firp->getDataScoops().end(), [&str,scoop,firp,at](IRDB_SDK::DataScoop_t* scoop_to_update)
+ for(auto scoop_to_update : firp->getDataScoops())
{
// for each relocation for that scoop
- for_each(scoop_to_update->getRelocations().begin(), scoop_to_update->getRelocations().end(), [&str,scoop,firp,scoop_to_update,at](IRDB_SDK::Relocation_t* reloc)
+ for (auto reloc : scoop_to_update->getRelocations())
{
// if it's a reloc that's wrt scoop
auto wrt=dynamic_cast<IRDB_SDK::DataScoop_t*>(reloc->getWRT());
@@ -150,9 +141,9 @@ static void insert_into_scoop_at(const string &str, IRDB_SDK::DataScoop_t* scoop
}
}
- });
+ };
- });
+ };
};
template<int ptrsize>
--
GitLab