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/third_party/glog/src/mock-log.h | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/runtime/onnxruntime/third_party/glog/src/mock-log.h b/runtime/onnxruntime/third_party/glog/src/mock-log.h
index a6c1147..62999b2 100644
--- a/runtime/onnxruntime/third_party/glog/src/mock-log.h
+++ b/runtime/onnxruntime/third_party/glog/src/mock-log.h
@@ -36,12 +36,13 @@
#define GLOG_SRC_MOCK_LOG_H_
// For GOOGLE_NAMESPACE. This must go first so we get _XOPEN_SOURCE.
-#include <gmock/gmock.h>
+#include "utilities.h"
#include <string>
-#include "glog/logging.h"
-#include "utilities.h"
+#include <gmock/gmock.h>
+
+#include <glog/logging.h>
_START_GOOGLE_NAMESPACE_
namespace glog_testing {
--
Gitblit v1.9.1