Merge pull request #2 from lizan/type_helper_init

TypeHelper to be initialized with existing Resolver

Author: lizan

src/type_helper.cc

@@ -107,6 +107,10 @@ class SimpleTypeResolver : public pbutil::TypeResolver {
   SimpleTypeResolver& operator=(const SimpleTypeResolver&) = delete;
 };
 
+TypeHelper::TypeHelper(pbutil::TypeResolver* type_resolver)
+    : type_resolver_(type_resolver),
+      type_info_(pbconv::TypeInfo::NewTypeInfo(type_resolver)) {}
+
 TypeHelper::~TypeHelper() {
   type_info_.reset();
   delete type_resolver_;
@@ -121,9 +125,13 @@ void TypeHelper::Initialize() {
   type_info_.reset(pbconv::TypeInfo::NewTypeInfo(type_resolver_));
 }
 
-void TypeHelper::AddType(const pb::Type& t) { type_resolver_->AddType(t); }
+void TypeHelper::AddType(const pb::Type& t) {
+  reinterpret_cast<SimpleTypeResolver*>(type_resolver_)->AddType(t);
+}
 
-void TypeHelper::AddEnum(const pb::Enum& e) { type_resolver_->AddEnum(e); }
+void TypeHelper::AddEnum(const pb::Enum& e) {
+  reinterpret_cast<SimpleTypeResolver*>(type_resolver_)->AddEnum(e);
+}
 
 pbutil::Status TypeHelper::ResolveFieldPath(
     const pb::Type& type, const std::string& field_path_str,

src/type_helper.h

@@ -36,6 +36,9 @@ class TypeHelper {
  public:
   template <typename Types, typename Enums>
   TypeHelper(const Types& types, const Enums& enums);
+
+  TypeHelper(::google::protobuf::util::TypeResolver* type_resolver);
+
   ~TypeHelper();
 
   ::google::protobuf::util::TypeResolver* Resolver() const;
@@ -77,7 +80,7 @@ class TypeHelper {
   // unique_ptr requires the type to be defined when the unique_ptr destructor
   // is called. In our case it's called from the template constructor below
   // (most likely as a part of stack unwinding when an exception occurs).
-  SimpleTypeResolver* type_resolver_;
+  ::google::protobuf::util::TypeResolver* type_resolver_;
   std::unique_ptr<::google::protobuf::util::converter::TypeInfo> type_info_;
 
   TypeHelper() = delete;