Merge pull request #6201 from wmtan/FindBuiltInTypesFirst

Look for built in types first
cms-sw · Nov 4, 2014 · 53b481f · 53b481f
2 parents 0cb931a + 7221e45
commit 53b481f
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/FWCore/Utilities/src/TypeWithDict.cc b/FWCore/Utilities/src/TypeWithDict.cc
@@ -80,10 +80,6 @@ namespace edm {
     if (it != typeMap.end()) {
       return TypeWithDict(it->second, property);
     }
-    TClass* theClass = TClass::GetClass(name.c_str());
-    if (theClass != nullptr && theClass->GetTypeInfo() != nullptr) {
-      return TypeWithDict(theClass, property);
-    }
     TDataType* theDataType = gROOT->GetType(name.c_str()); 
     if(theDataType) {
       switch(theDataType->GetType()) {
@@ -128,6 +124,10 @@ namespace edm {
       return TypeWithDict(typeid(void), property);
     }
 
+    TClass* theClass = TClass::GetClass(name.c_str());
+    if (theClass != nullptr && theClass->GetTypeInfo() != nullptr) {
+      return TypeWithDict(theClass, property);
+    }
     TEnum* theEnum = TEnum::GetEnum(name.c_str(), TEnum::kAutoload);
     if(theEnum) {
       return TypeWithDict(theEnum, name, property);