From d541b001dafdf4d5fb06e13c380e2489af471693 Mon Sep 17 00:00:00 2001
From: yanghaoran <yanghaoran2@huawei.com>
Date: Thu, 29 Jul 2021 16:50:39 +0800
Subject: [PATCH] temporary fix of conflicting definitions

---
 metadef                                            | 2 +-
 third_party/fwkacllib/inc/toolchain/prof_acl_api.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/metadef b/metadef
index 21178899..e7b48d87 160000
--- a/metadef
+++ b/metadef
@@ -1 +1 @@
-Subproject commit 211788997dcc9aa63527541a44d511388c06bce5
+Subproject commit e7b48d87d861921299e7c0fe293aaeac61136900
diff --git a/third_party/fwkacllib/inc/toolchain/prof_acl_api.h b/third_party/fwkacllib/inc/toolchain/prof_acl_api.h
index 9350f9d4..11e259b9 100644
--- a/third_party/fwkacllib/inc/toolchain/prof_acl_api.h
+++ b/third_party/fwkacllib/inc/toolchain/prof_acl_api.h
@@ -106,7 +106,7 @@ extern "C" {
 
 MSVP_PROF_API uint64_t ProfGetOpExecutionTime(const void *data, uint32_t len, uint32_t index);
 
-typedef int Status;
+typedef uint32_t Status;
 typedef struct aclprofSubscribeConfig aclprofSubscribeConfig1;
 ///
 /// @ingroup AscendCL