Skip to content

Commit 93941d5

Browse files
Merge pull request #117 from Vipul-Cariappa/dev/Protected-Using
Accessing `Cpp::*` functions through `Cpp::GetUnderlyingScope`
2 parents 33b69db + dbb3b33 commit 93941d5

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

clingwrapper/src/clingwrapper.cxx

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,7 @@ Cppyy::TCppScope_t Cppyy::GetScope(const std::string& name,
595595

596596
Cppyy::TCppScope_t Cppyy::GetFullScope(const std::string& name)
597597
{
598-
return Cpp::GetScopeFromCompleteName(name);
598+
return Cppyy::GetScope(name);
599599
}
600600

601601
Cppyy::TCppScope_t Cppyy::GetTypeScope(TCppScope_t var)
@@ -988,7 +988,7 @@ bool Cppyy::IsEnumScope(TCppScope_t scope)
988988

989989
bool Cppyy::IsEnumConstant(TCppScope_t scope)
990990
{
991-
return Cpp::IsEnumConstant(scope);
991+
return Cpp::IsEnumConstant(Cpp::GetUnderlyingScope(scope));
992992
}
993993

994994
bool Cppyy::IsEnumType(TCppType_t type)
@@ -1106,7 +1106,7 @@ std::vector<Cppyy::TCppScope_t> Cppyy::GetUsingNamespaces(TCppScope_t scope)
11061106
// // class reflection information ----------------------------------------------
11071107
std::string Cppyy::GetFinalName(TCppType_t klass)
11081108
{
1109-
return Cpp::GetCompleteName(klass);
1109+
return Cpp::GetCompleteName(Cpp::GetUnderlyingScope(klass));
11101110
}
11111111

11121112
std::string Cppyy::GetScopedFinalName(TCppType_t klass)
@@ -1696,13 +1696,13 @@ bool Cppyy::CheckDatamember(TCppScope_t scope, const std::string& name) {
16961696

16971697
Cppyy::TCppType_t Cppyy::GetDatamemberType(TCppScope_t var)
16981698
{
1699-
return Cpp::GetVariableType(var);
1699+
return Cpp::GetVariableType(Cpp::GetUnderlyingScope(var));
17001700
}
17011701

17021702
std::string Cppyy::GetDatamemberTypeAsString(TCppScope_t scope)
17031703
{
1704-
return Cpp::GetTypeAsString(
1705-
Cpp::GetVariableType(scope));
1704+
return Cpp::GetTypeAsString(
1705+
Cpp::GetVariableType(Cpp::GetUnderlyingScope(scope)));
17061706
}
17071707

17081708
std::string Cppyy::GetTypeAsString(TCppType_t type)
@@ -1712,7 +1712,7 @@ std::string Cppyy::GetTypeAsString(TCppType_t type)
17121712

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

17181718
// static inline
@@ -1804,7 +1804,7 @@ bool Cppyy::IsPrivateData(TCppScope_t datamem)
18041804

18051805
bool Cppyy::IsStaticDatamember(TCppScope_t var)
18061806
{
1807-
return Cpp::IsStaticVariable(var);
1807+
return Cpp::IsStaticVariable(Cpp::GetUnderlyingScope(var));
18081808
}
18091809

18101810
bool Cppyy::IsConstVar(TCppScope_t var)
@@ -1865,7 +1865,7 @@ std::vector<Cppyy::TCppScope_t> Cppyy::GetEnumConstants(TCppScope_t scope)
18651865

18661866
Cppyy::TCppType_t Cppyy::GetEnumConstantType(TCppScope_t scope)
18671867
{
1868-
return Cpp::GetEnumConstantType(scope);
1868+
return Cpp::GetEnumConstantType(Cpp::GetUnderlyingScope(scope));
18691869
}
18701870

18711871
Cppyy::TCppIndex_t Cppyy::GetEnumDataValue(TCppScope_t scope)

0 commit comments

Comments
 (0)