Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update Cpp::GetVariableOffset according to API changes to handle multiple inheritance #118

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions clingwrapper/src/clingwrapper.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -1710,9 +1710,9 @@ std::string Cppyy::GetTypeAsString(TCppType_t type)
return Cpp::GetTypeAsString(type);
}

intptr_t Cppyy::GetDatamemberOffset(TCppScope_t var)
intptr_t Cppyy::GetDatamemberOffset(TCppScope_t var, TCppScope_t klass)
{
return Cpp::GetVariableOffset(Cpp::GetUnderlyingScope(var));
return Cpp::GetVariableOffset(Cpp::GetUnderlyingScope(var), klass);
}

// static inline
Expand Down
2 changes: 1 addition & 1 deletion clingwrapper/src/cpp_cppyy.h
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ namespace Cppyy {
RPY_EXPORTED
std::string GetTypeAsString(TCppType_t type);
RPY_EXPORTED
intptr_t GetDatamemberOffset(TCppScope_t var);
intptr_t GetDatamemberOffset(TCppScope_t var, TCppScope_t klass = nullptr);
RPY_EXPORTED
bool CheckDatamember(TCppScope_t scope, const std::string& name);

Expand Down
Loading