Incorporate with Google import (#16)

lizan · web-flow · commit dadab6a5a273 · 2017-07-14T15:53:36.000-07:00
diff --git a/src/prefix_writer.cc b/src/prefix_writer.cc
@@ -29,7 +29,7 @@ namespace transcoding {
 
 PrefixWriter::PrefixWriter(const std::string& prefix,
                            google::protobuf::util::converter::ObjectWriter* ow)
-    : prefix_(google::protobuf::Split(prefix, ".", true)),
+    : prefix_(google::protobuf::Split(prefix, ".")),
       non_actionable_depth_(0),
       writer_(ow) {}
 
diff --git a/src/type_helper.cc b/src/type_helper.cc
@@ -137,7 +137,7 @@ pbutil::Status TypeHelper::ResolveFieldPath(
     const pb::Type& type, const std::string& field_path_str,
     std::vector<const pb::Field*>* field_path_out) const {
   // Split the field names & call ResolveFieldPath()
-  auto field_names = pb::Split(field_path_str, ".");
+  const std::vector<std::string> field_names = pb::Split(field_path_str, ".");
   return ResolveFieldPath(type, field_names, field_path_out);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ pbutil::Status TypeHelper::ResolveFieldPath(`
`137`	`137`	`const pb::Type& type, const std::string& field_path_str,`
`138`	`138`	`std::vector<const pb::Field> field_path_out) const {`
`139`	`139`	`// Split the field names & call ResolveFieldPath()`
`140`		`- auto field_names = pb::Split(field_path_str, ".");`
	`140`	`+ const std::vector<std::string> field_names = pb::Split(field_path_str, ".");`
`141`	`141`	`return ResolveFieldPath(type, field_names, field_path_out);`
`142`	`142`	`}`
`143`	`143`