Merge branch 'development' of gitee.com:ascend/parser into development

parser/caffe/caffe_parser.cc

@@ -202,9 +202,9 @@ const char *const kFieldInnerPro = "inner_product_param";
 const char *const kFieldDim = "dim";
 const char *const kFieldBiasTerm = "bias_term";
 const char *const kDevNull = "/dev/null";
-const char* const kMessage = "message";
-const char* const kLayerParameter = "LayerParameter";
-const char* const kCloseBrace = "}";
+const std::string kMessage = "message";
+const std::string kLayerParameter = "LayerParameter";
+const std::string kCloseBrace = "}";
 const std::string kOptional = "optional";
 const std::string kRepeated = "repeated";
 const std::string kRequired = "required";

parser/common/parser_utils.h

@@ -31,7 +31,8 @@ class ParserUtils {
   static Status HandleInputContext(const NodePtr &node,
                                    const std::vector<NodePtr> &input_nodes,
                                    const ComputeGraphPtr &compute_graph);
-  static Status HandleOutputContext(const NodePtr &node, const std::vector<std::pair<NodePtr, int32_t>> &out_node_index);
+  static Status HandleOutputContext(const NodePtr &node, 
+                                    const std::vector<std::pair<NodePtr, int32_t>> &out_node_index);
 };
 }  // namespace ge
 #endif  // PARSER_COMMON_PARSER_UTILS_H_