Skip to content

Commit 36028bd

Browse files
update Cpp::GetVariableOffset according to API changes to handle multiple inheritance
1 parent 93941d5 commit 36028bd

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

clingwrapper/src/clingwrapper.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1710,9 +1710,9 @@ std::string Cppyy::GetTypeAsString(TCppType_t type)
17101710
return Cpp::GetTypeAsString(type);
17111711
}
17121712

1713-
intptr_t Cppyy::GetDatamemberOffset(TCppScope_t var)
1713+
intptr_t Cppyy::GetDatamemberOffset(TCppScope_t var, TCppScope_t klass)
17141714
{
1715-
return Cpp::GetVariableOffset(Cpp::GetUnderlyingScope(var));
1715+
return Cpp::GetVariableOffset(Cpp::GetUnderlyingScope(var), klass);
17161716
}
17171717

17181718
// static inline

clingwrapper/src/cpp_cppyy.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ namespace Cppyy {
349349
RPY_EXPORTED
350350
std::string GetTypeAsString(TCppType_t type);
351351
RPY_EXPORTED
352-
intptr_t GetDatamemberOffset(TCppScope_t var);
352+
intptr_t GetDatamemberOffset(TCppScope_t var, TCppScope_t klass = nullptr);
353353
RPY_EXPORTED
354354
bool CheckDatamember(TCppScope_t scope, const std::string& name);
355355

0 commit comments

Comments
 (0)