Skip to content

Commit 7ee7774

Browse files
aaronj0vgvassilev
authored andcommitted
Make GetDataMember use an out param
1 parent fbe9888 commit 7ee7774

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

clingwrapper/src/clingwrapper.cxx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1627,9 +1627,10 @@ bool Cppyy::IsStaticMethod(TCppMethod_t method)
16271627
// return (TCppIndex_t)0; // unknown class?
16281628
// }
16291629

1630-
std::vector<Cppyy::TCppScope_t> Cppyy::GetDatamembers(TCppScope_t scope)
1630+
void Cppyy::GetDatamembers(TCppScope_t scope, std::vector<TCppScope_t>& datamembers)
16311631
{
1632-
return Cpp::GetDatamembers(scope);
1632+
Cpp::GetDatamembers(scope, datamembers);
1633+
Cpp::GetStaticDatamembers(scope, datamembers);
16331634
}
16341635

16351636
bool Cppyy::CheckDatamember(TCppScope_t scope, const std::string& name) {

clingwrapper/src/cpp_cppyy.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ namespace Cppyy {
334334
// RPY_EXPORTED
335335
// TCppIndex_t GetNumDatamembers(TCppScope_t scope, bool accept_namespace = false) { return 0; }
336336
RPY_EXPORTED
337-
std::vector<TCppScope_t> GetDatamembers(TCppScope_t scope);
337+
void GetDatamembers(TCppScope_t scope, std::vector<TCppScope_t>& datamembers);
338338
// GetDatamemberName is unused.
339339
// RPY_EXPORTED
340340
// std::string GetDatamemberName(TCppScope_t scope, TCppIndex_t idata) { return ""; }

0 commit comments

Comments
 (0)