From d80ac2fd2df4e7fb8a28acfa512bb11472b5cc99 Mon Sep 17 00:00:00 2001
From: liugz18 <57401541+liugz18@users.noreply.github.com>
Date: 星期四, 18 七月 2024 21:34:55 +0800
Subject: [PATCH] Rename 'res' in line 514 to avoid with naming conflict with line 365
---
runtime/onnxruntime/src/alignedmem.cpp | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/runtime/onnxruntime/src/alignedmem.cpp b/runtime/onnxruntime/src/alignedmem.cpp
index 9c7d323..b72c623 100644
--- a/runtime/onnxruntime/src/alignedmem.cpp
+++ b/runtime/onnxruntime/src/alignedmem.cpp
@@ -6,8 +6,8 @@
void *p1; // original block
void **p2; // aligned block
int offset = alignment - 1 + sizeof(void *);
- if ((p1 = (void *)malloc(required_bytes + offset)) == NULL) {
- return NULL;
+ if ((p1 = (void *)malloc(required_bytes + offset)) == nullptr) {
+ return nullptr;
}
p2 = (void **)(((size_t)(p1) + offset) & ~(alignment - 1));
p2[-1] = p1;
--
Gitblit v1.9.1