Merge pull request #3378 from wmtan/FixMemoryHoardingBug

Fix memory hoarding bug
cms-sw · Apr 17, 2014 · a306c52 · a306c52
2 parents aefd522 + db2b86e
commit a306c52
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/FWCore/Utilities/interface/TypeWithDict.h b/FWCore/Utilities/interface/TypeWithDict.h
@@ -119,6 +119,9 @@ class TypeWithDict {
   void deallocate(void* address) const;
   ObjectWithDict construct() const;
   void destruct(void* address, bool dealloc = true) const;
+  void* ttype() const {
+    return type_;
+  }
 };
 
 // A related free function

diff --git a/FWCore/Utilities/src/ObjectWithDict.cc b/FWCore/Utilities/src/ObjectWithDict.cc
@@ -18,12 +18,12 @@ namespace edm {
   }
 
   ObjectWithDict::ObjectWithDict(TypeWithDict const& type, void* address) :
-    type_(gInterpreter->Type_Factory(type.typeInfo())),
+    type_(static_cast<TType*>(type.ttype())),
     address_(address) {
   }
 
   ObjectWithDict::ObjectWithDict(std::type_info const& ti, void* address) :
-    type_(gInterpreter->Type_Factory(ti)),
+    type_(static_cast<TType*>(TypeWithDict(ti).ttype())),
     address_(address) {
   }