Merge pull request #47442 from fwyzard/modernise_ObjectWithDict

Modernise the interface of `ObjectWithDict`

Author: cmsbuild

FWCore/Reflection/interface/ObjectWithDict.h

@@ -23,20 +23,26 @@ namespace edm {
     static ObjectWithDict byType(TypeWithDict const&);
 
   public:
-    ObjectWithDict();
-    explicit ObjectWithDict(TypeWithDict const&, void* address);
-    explicit ObjectWithDict(std::type_info const&, void* address);
-    explicit operator bool() const;
-    void* address() const;
-    TypeWithDict typeOf() const;
+    ObjectWithDict() : address_(nullptr) {}
+    explicit ObjectWithDict(TypeWithDict const& type, void* address) : type_(type), address_(address) {}
+    explicit ObjectWithDict(std::type_info const& type, void* address) : type_(TypeWithDict(type)), address_(address) {}
+    explicit operator bool() const { return bool(type_) && (address_ != nullptr); }
+    void* address() const { return address_; }
+    TypeWithDict const& typeOf() const { return type_; }
     TypeWithDict dynamicType() const;
     ObjectWithDict castObject(TypeWithDict const&) const;
     ObjectWithDict get(std::string const& memberName) const;
     //ObjectWithDict construct() const;
     void destruct(bool dealloc) const;
+
+    template <typename T>
+    T& objectCast() {
+      return *reinterpret_cast<T*>(address());
+    }
+
     template <typename T>
-    T objectCast() {
-      return *reinterpret_cast<T*>(address_);
+    T const& objectCast() const {
+      return *reinterpret_cast<T*>(address());
     }
   };
 

FWCore/Reflection/src/ObjectWithDict.cc

@@ -1,40 +1,27 @@
-#include "FWCore/Reflection/interface/ObjectWithDict.h"
+#ifndef _LIBCPP_VERSION
+#include <cxxabi.h>
+#endif
 
 #include "FWCore/Reflection/interface/BaseWithDict.h"
 #include "FWCore/Reflection/interface/MemberWithDict.h"
+#include "FWCore/Reflection/interface/ObjectWithDict.h"
 #include "FWCore/Reflection/interface/TypeWithDict.h"
 
-#ifndef _LIBCPP_VERSION
-#include <cxxabi.h>
-#endif
-
 namespace edm {
 
   ObjectWithDict ObjectWithDict::byType(TypeWithDict const& type) {
     ObjectWithDict obj(type.construct());
     return obj;
   }
 
-  ObjectWithDict::ObjectWithDict() : type_(), address_(nullptr) {}
-
-  ObjectWithDict::ObjectWithDict(TypeWithDict const& type, void* address) : type_(type), address_(address) {}
-
-  ObjectWithDict::ObjectWithDict(std::type_info const& ti, void* address)
-      : type_(TypeWithDict(ti)), address_(address) {}
-
-  ObjectWithDict::operator bool() const { return bool(type_) && (address_ != nullptr); }
-
-  void* ObjectWithDict::address() const { return address_; }
-
-  TypeWithDict ObjectWithDict::typeOf() const { return type_; }
-
   class DummyVT {
   public:
     virtual ~DummyVT();
   };
 
   DummyVT::~DummyVT() {}
 
+  // FIXME improve TypeWithDict::byTypeInfo to return by const& and return by const& here
   TypeWithDict ObjectWithDict::dynamicType() const {
     if (!type_.isVirtual()) {
       return type_;