Merge pull request #6730 from wmtan/FindIndirectDataMembers

Find indirect data members
cms-sw · Dec 2, 2014 · ad8d4b3 · ad8d4b3
2 parents 7d587d5 + cdea9de
commit ad8d4b3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/FWCore/Utilities/src/MemberWithDict.cc b/FWCore/Utilities/src/MemberWithDict.cc
@@ -7,7 +7,7 @@
 
 namespace edm {
 
-  MemberWithDict::MemberWithDict() : dataMember_() {
+  MemberWithDict::MemberWithDict() : dataMember_(nullptr) {
   }
 
   MemberWithDict::MemberWithDict(TDataMember* dataMember) : dataMember_(dataMember) {

diff --git a/FWCore/Utilities/src/TypeWithDict.cc b/FWCore/Utilities/src/TypeWithDict.cc
@@ -16,6 +16,7 @@
 #include "TEnumConstant.h"
 #include "TInterpreter.h"
 #include "TMethodArg.h"
+#include "TRealData.h"
 #include "TROOT.h"
 
 #include "boost/thread/tss.hpp"
@@ -535,7 +536,15 @@ namespace edm {
   MemberWithDict
   TypeWithDict::dataMemberByName(std::string const& member) const {
     if (class_ != nullptr) {
-      return MemberWithDict(class_->GetDataMember(member.c_str()));
+      TDataMember* dataMember = class_->GetDataMember(member.c_str());
+      if(dataMember == nullptr) {
+        // Look for indirect data members
+        TRealData* realDataMember = class_->GetRealData(member.c_str());
+        if(realDataMember != nullptr) {
+          dataMember = realDataMember->GetDataMember();
+        }
+      }
+      return MemberWithDict(dataMember);
     }
     if (enum_ != nullptr) {
       TClass* cl = enum_->GetClass();