From e8798bdab134e270eade1543aed9b7773964799d Mon Sep 17 00:00:00 2001 From: Vipul Cariappa Date: Tue, 17 Dec 2024 19:26:22 +0530 Subject: [PATCH 1/2] update `Cppyy::GetDatamemberOffset` to handle multiple inheritance --- src/CPPDataMember.cxx | 2 +- src/Cppyy.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CPPDataMember.cxx b/src/CPPDataMember.cxx index 0fa7351..eb83e4e 100644 --- a/src/CPPDataMember.cxx +++ b/src/CPPDataMember.cxx @@ -323,7 +323,7 @@ void CPyCppyy::CPPDataMember::Set(Cppyy::TCppScope_t scope, Cppyy::TCppScope_t d { fEnclosingScope = scope; fScope = data; - fOffset = Cppyy::GetDatamemberOffset(data); // XXX: Check back here // TODO: make lazy + fOffset = Cppyy::GetDatamemberOffset(data, scope); // XXX: Check back here // TODO: make lazy fFlags = Cppyy::IsStaticDatamember(data) ? kIsStaticData : 0; const std::string name = Cppyy::GetFinalName(data); diff --git a/src/Cppyy.h b/src/Cppyy.h index 0ab2f78..4d01f75 100644 --- a/src/Cppyy.h +++ b/src/Cppyy.h @@ -324,7 +324,7 @@ namespace Cppyy { CPPYY_IMPORT std::string GetDatamemberTypeAsString(TCppScope_t var); CPPYY_IMPORT - intptr_t GetDatamemberOffset(TCppScope_t var); + intptr_t GetDatamemberOffset(TCppScope_t var, TCppScope_t klass = nullptr); CPPYY_IMPORT bool CheckDatamember(TCppScope_t scope, const std::string& name); From 0e93ac1b0baeee976bec37e491d360ba146e71af Mon Sep 17 00:00:00 2001 From: Vipul Cariappa Date: Thu, 19 Dec 2024 19:23:49 +0530 Subject: [PATCH 2/2] fix OSX-X86 dependency --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 113f56d..b15267f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -304,7 +304,10 @@ jobs: run: | brew update brew remove ruby@3.0 - brew remove unxip + export ARCHITECHURE=$(uname -m) + if [[ "$ARCHITECHURE" != "x86_64" ]]; then + brew remove unxip + fi # workaround for https://github.com/actions/setup-python/issues/577 for pkg in $(brew list | grep '^python@'); do brew unlink "$pkg"