@@ -595,7 +595,7 @@ Cppyy::TCppScope_t Cppyy::GetScope(const std::string& name,
595
595
596
596
Cppyy::TCppScope_t Cppyy::GetFullScope (const std::string& name)
597
597
{
598
- return Cpp::GetScopeFromCompleteName (name);
598
+ return Cppyy::GetScope (name);
599
599
}
600
600
601
601
Cppyy::TCppScope_t Cppyy::GetTypeScope (TCppScope_t var)
@@ -988,7 +988,7 @@ bool Cppyy::IsEnumScope(TCppScope_t scope)
988
988
989
989
bool Cppyy::IsEnumConstant (TCppScope_t scope)
990
990
{
991
- return Cpp::IsEnumConstant (scope);
991
+ return Cpp::IsEnumConstant (Cpp::GetUnderlyingScope ( scope) );
992
992
}
993
993
994
994
bool Cppyy::IsEnumType (TCppType_t type)
@@ -1106,7 +1106,7 @@ std::vector<Cppyy::TCppScope_t> Cppyy::GetUsingNamespaces(TCppScope_t scope)
1106
1106
// // class reflection information ----------------------------------------------
1107
1107
std::string Cppyy::GetFinalName (TCppType_t klass)
1108
1108
{
1109
- return Cpp::GetCompleteName (klass);
1109
+ return Cpp::GetCompleteName (Cpp::GetUnderlyingScope ( klass) );
1110
1110
}
1111
1111
1112
1112
std::string Cppyy::GetScopedFinalName (TCppType_t klass)
@@ -1696,13 +1696,13 @@ bool Cppyy::CheckDatamember(TCppScope_t scope, const std::string& name) {
1696
1696
1697
1697
Cppyy::TCppType_t Cppyy::GetDatamemberType (TCppScope_t var)
1698
1698
{
1699
- return Cpp::GetVariableType (var);
1699
+ return Cpp::GetVariableType (Cpp::GetUnderlyingScope ( var) );
1700
1700
}
1701
1701
1702
1702
std::string Cppyy::GetDatamemberTypeAsString (TCppScope_t scope)
1703
1703
{
1704
- return Cpp::GetTypeAsString (
1705
- Cpp::GetVariableType (scope));
1704
+ return Cpp::GetTypeAsString (
1705
+ Cpp::GetVariableType (Cpp::GetUnderlyingScope ( scope) ));
1706
1706
}
1707
1707
1708
1708
std::string Cppyy::GetTypeAsString (TCppType_t type)
@@ -1712,7 +1712,7 @@ std::string Cppyy::GetTypeAsString(TCppType_t type)
1712
1712
1713
1713
intptr_t Cppyy::GetDatamemberOffset (TCppScope_t var)
1714
1714
{
1715
- return Cpp::GetVariableOffset (var);
1715
+ return Cpp::GetVariableOffset (Cpp::GetUnderlyingScope ( var) );
1716
1716
}
1717
1717
1718
1718
// static inline
@@ -1804,7 +1804,7 @@ bool Cppyy::IsPrivateData(TCppScope_t datamem)
1804
1804
1805
1805
bool Cppyy::IsStaticDatamember (TCppScope_t var)
1806
1806
{
1807
- return Cpp::IsStaticVariable (var);
1807
+ return Cpp::IsStaticVariable (Cpp::GetUnderlyingScope ( var) );
1808
1808
}
1809
1809
1810
1810
bool Cppyy::IsConstVar (TCppScope_t var)
@@ -1865,7 +1865,7 @@ std::vector<Cppyy::TCppScope_t> Cppyy::GetEnumConstants(TCppScope_t scope)
1865
1865
1866
1866
Cppyy::TCppType_t Cppyy::GetEnumConstantType (TCppScope_t scope)
1867
1867
{
1868
- return Cpp::GetEnumConstantType (scope);
1868
+ return Cpp::GetEnumConstantType (Cpp::GetUnderlyingScope ( scope) );
1869
1869
}
1870
1870
1871
1871
Cppyy::TCppIndex_t Cppyy::GetEnumDataValue (TCppScope_t scope)
0 commit comments