From 368ed65491d7290de8cc956e06ea29c85c990932 Mon Sep 17 00:00:00 2001
From: wangxiaotian22 <wangxiaotian4@huawei.com>
Date: Tue, 2 Mar 2021 17:07:40 +0800
Subject: [PATCH] fix compile

---
 ge/graph/load/model_manager/davinci_model.h | 4 ++--
 ge/graph/manager/graph_manager.cc           | 2 +-
 ge/graph/manager/graph_manager.h            | 6 +++---
 metadef                                     | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ge/graph/load/model_manager/davinci_model.h b/ge/graph/load/model_manager/davinci_model.h
index c4979cb3..1e608735 100755
--- a/ge/graph/load/model_manager/davinci_model.h
+++ b/ge/graph/load/model_manager/davinci_model.h
@@ -412,7 +412,7 @@ class DavinciModel {
   ///
   uint64_t GetSessionId() const { return session_id_; }
 
-  struct ErrorManager::ErrorContext &GetErrorContext() const { return error_context_; }
+  struct ErrorMessage::Context &GetErrorContext() const { return error_context_; }
 
   ///
   /// @ingroup ge
@@ -958,7 +958,7 @@ class DavinciModel {
   vector<uintptr_t> output_mbuf_list_;  // output mbuf created by dequeue task.
 
   uint64_t session_id_;
-  struct ErrorManager::ErrorContext error_context_;
+  struct ErrorMessage::Context error_context_;
 
   uint32_t device_id_;
 
diff --git a/ge/graph/manager/graph_manager.cc b/ge/graph/manager/graph_manager.cc
index 3a4d6838..d2c1d062 100755
--- a/ge/graph/manager/graph_manager.cc
+++ b/ge/graph/manager/graph_manager.cc
@@ -2511,7 +2511,7 @@ Status GraphManager::ProcessSubGraphWithMultiThreads(GraphManager *graph_manager
                                                      const SubGraphInfoPtr &sub_graph_info_ptr,
                                                      const std::string &root_graph_name,
                                                      uint64_t session_id,
-                                                     const struct ErrorManager::ErrorContext &error_context,
+                                                     const struct ErrorMessage::Context &error_context,
                                                      const GEThreadLocalContext &ge_context) {
   if (sub_graph_info_ptr != nullptr && graph_manager != nullptr) {
     ErrorManager::GetInstance().SetErrorContext(error_context);
diff --git a/ge/graph/manager/graph_manager.h b/ge/graph/manager/graph_manager.h
index ad1c8b52..661cf9d8 100644
--- a/ge/graph/manager/graph_manager.h
+++ b/ge/graph/manager/graph_manager.h
@@ -196,7 +196,7 @@ class GraphManager {
     GraphId graph_id;
     std::vector<ge::InputTensorInfo> input_tensor;
     uint64_t session_id;
-    struct ErrorManager::ErrorContext error_context;
+    struct ErrorMessage::Context error_context;
     GEThreadLocalContext context;
     RunAsyncCallback callback;
   };
@@ -205,7 +205,7 @@ class GraphManager {
     GraphNodePtr graph_node;
     GraphId graph_id;
     uint64_t session_id;
-    struct ErrorManager::ErrorContext error_context;
+    struct ErrorMessage::Context error_context;
     std::vector<ge::InputTensorInfo> input_tensor;
     GeRootModelPtr ge_root_model;
     GEThreadLocalContext context;
@@ -223,7 +223,7 @@ class GraphManager {
                                                 const SubGraphInfoPtr &sub_graph_info_ptr,
                                                 const std::string &root_graph_name,
                                                 uint64_t session_id,
-                                                const struct ErrorManager::ErrorContext &error_context,
+                                                const struct ErrorMessage::Context &error_context,
                                                 const GEThreadLocalContext &ge_context);
   Status ParseInputsDims(const std::vector<InputTensorInfo> &input_tensor);
   void ParseInputsDimsForData(const std::vector<InputTensorInfo> &input_tensor);
diff --git a/metadef b/metadef
index 9df9acb1..e058adce 160000
--- a/metadef
+++ b/metadef
@@ -1 +1 @@
-Subproject commit 9df9acb1d868309247e9abd04ef32810ec4d781c
+Subproject commit e058adce607c16865dcb30a23978cf4987556349