From de73a183d6e1ffd09a0c5bbbd38280e9a5f1186b Mon Sep 17 00:00:00 2001 From: CristinaCristescu Date: Mon, 9 Dec 2013 11:49:08 +0100 Subject: [PATCH] ROOT-5819 rename offset calculation parameter from to . --- core/meta/src/TClass.cxx | 6 +++--- core/meta/src/TCling.cxx | 8 ++++---- core/meta/src/TCling.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/meta/src/TClass.cxx b/core/meta/src/TClass.cxx index 569db27c364fa..f54efa507fff0 100644 --- a/core/meta/src/TClass.cxx +++ b/core/meta/src/TClass.cxx @@ -2330,9 +2330,9 @@ Int_t TClass::GetBaseClassOffset(const TClass *cl, void *address) R__LOCKGUARD(gInterpreterMutex); ClassInfo_t* derived = GetClassInfo(); - ClassInfo_t* target = cl->GetClassInfo(); - if(derived && target) { - return gCling->ClassInfo_GetBaseOffset(derived, target, address); + ClassInfo_t* base = cl->GetClassInfo(); + if(derived && base) { + return gCling->ClassInfo_GetBaseOffset(derived, base, address); } else { Int_t offset = GetBaseClassOffsetRecurse (cl); diff --git a/core/meta/src/TCling.cxx b/core/meta/src/TCling.cxx index fa922f777c0e8..a4d9d892d098d 100644 --- a/core/meta/src/TCling.cxx +++ b/core/meta/src/TCling.cxx @@ -5090,15 +5090,15 @@ Long_t TCling::BaseClassInfo_Offset(BaseClassInfo_t* bcinfo, void * address) con } //______________________________________________________________________________ -Long_t TCling::ClassInfo_GetBaseOffset(ClassInfo_t* derived, ClassInfo_t* target, void * address) const +Long_t TCling::ClassInfo_GetBaseOffset(ClassInfo_t* derived, ClassInfo_t* base, void * address) const { TClingClassInfo* TClinginfo = (TClingClassInfo*) derived; - TClingClassInfo* TClinginfoTarget = (TClingClassInfo*) target; + TClingClassInfo* TClinginfoBase = (TClingClassInfo*) base; // Offset to the class itself. - if (TClinginfo->GetDecl() == TClinginfoTarget->GetDecl()) { + if (TClinginfo->GetDecl() == TClinginfoBase->GetDecl()) { return 0; } - return TClinginfo->GetBaseOffset(TClinginfoTarget, address); + return TClinginfo->GetBaseOffset(TClinginfoBase, address); } //______________________________________________________________________________ diff --git a/core/meta/src/TCling.h b/core/meta/src/TCling.h index 4fbad211f9fe8..f54fbe8a4d791 100644 --- a/core/meta/src/TCling.h +++ b/core/meta/src/TCling.h @@ -312,7 +312,7 @@ class TCling : public TInterpreter { virtual ClassInfo_t* ClassInfo_Factory() const; virtual ClassInfo_t* ClassInfo_Factory(ClassInfo_t* cl) const; virtual ClassInfo_t* ClassInfo_Factory(const char* name) const; - virtual Long_t ClassInfo_GetBaseOffset(ClassInfo_t* derived, ClassInfo_t* target, void * address) const; + virtual Long_t ClassInfo_GetBaseOffset(ClassInfo_t* derived, ClassInfo_t* base, void * address) const; virtual int ClassInfo_GetMethodNArg(ClassInfo_t* info, const char* method, const char* proto, Bool_t objectIsConst = false, ROOT::EFunctionMatchMode mode = ROOT::kConversionMatch) const; virtual bool ClassInfo_HasDefaultConstructor(ClassInfo_t* info) const; virtual bool ClassInfo_HasMethod(ClassInfo_t* info, const char* name) const;