From 50ffee2017d37b002e9216737bd950401b52d357 Mon Sep 17 00:00:00 2001 From: Jason Hiser <jdhiser@gmail.com> Date: Sun, 2 Feb 2025 19:12:27 -0500 Subject: [PATCH] Update to fix errs. --- irdb-libs/libIRDB-elfdep/src/elfdep.cpp | 7 ++++++- irdb-libs/libIRDB-syscall/include/syscall.hpp | 4 +++- irdb-sdk | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/irdb-libs/libIRDB-elfdep/src/elfdep.cpp b/irdb-libs/libIRDB-elfdep/src/elfdep.cpp index f8971be94..f2546a430 100644 --- a/irdb-libs/libIRDB-elfdep/src/elfdep.cpp +++ b/irdb-libs/libIRDB-elfdep/src/elfdep.cpp @@ -44,6 +44,11 @@ using IRDB_SDK::DataScoop_t; #define REV_ALLOF(a) rbegin(a), rend(a) #define ALLOF(a) begin(a), end(a) +template <typename Func, typename T> +auto myBind2nd(Func func, const T& value) { + return std::bind(func, std::placeholders::_1, value); +} + // static helpers // use this to determine whether a scoop has a given name. @@ -58,7 +63,7 @@ static struct ScoopFinder : binary_function<const IRDB_SDK::DataScoop_t*,const s static IRDB_SDK::DataScoop_t* find_scoop(IRDB_SDK::FileIR_t *firp,const string &name) { - auto it=find_if(firp->getDataScoops().begin(), firp->getDataScoops().end(), bind2nd(finder, name)) ; + auto it=find_if(firp->getDataScoops().begin(), firp->getDataScoops().end(), myBind2nd(finder, name)) ; if( it != firp->getDataScoops().end() ) return *it; return NULL; diff --git a/irdb-libs/libIRDB-syscall/include/syscall.hpp b/irdb-libs/libIRDB-syscall/include/syscall.hpp index 0e54e9931..9f3308e70 100644 --- a/irdb-libs/libIRDB-syscall/include/syscall.hpp +++ b/irdb-libs/libIRDB-syscall/include/syscall.hpp @@ -46,7 +46,9 @@ namespace libIRDB - const IRDB_SDK::SyscallSiteSet_t& getSyscalls() {return syscalls;} + const IRDB_SDK::SyscallSiteSet_t& getSyscalls() const {return syscalls;} + IRDB_SDK::SyscallSiteSet_t getSyscalls() {return syscalls;} + protected: IRDB_SDK::SyscallNumber_t FindSystemCallNumber(IRDB_SDK::Instruction_t* insn, const IRDB_SDK::InstructionPredecessors_t& preds); diff --git a/irdb-sdk b/irdb-sdk index f3d491b57..ceb1a1646 160000 --- a/irdb-sdk +++ b/irdb-sdk @@ -1 +1 @@ -Subproject commit f3d491b57460bf89f648effe1693c5a909eca933 +Subproject commit ceb1a16469ce55d6cacb6de9129dfc45c21419f4 -- GitLab