!2065 temporary fix of conflicting definitions

Merge pull request !2065 from code_sync_0728
3 years ago · cc8b648004
--- a/+ 1
+++ b/+ 1
@@ -1 +1 @@
 Subproject commit 211788997dcc9aa63527541a44d511388c06bce5
 Subproject commit e7b48d87d861921299e7c0fe293aaeac61136900
--- 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