From 5297a2dc4b2f22c07b9bfd5aef6190efd51de0bb Mon Sep 17 00:00:00 2001
From: 雾聪 <wucong.lyb@alibaba-inc.com>
Date: 星期四, 16 十一月 2023 11:12:45 +0800
Subject: [PATCH] Merge branch 'main' of https://github.com/alibaba-damo-academy/FunASR into main
---
runtime/onnxruntime/third_party/glog/src/utilities.h | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/runtime/onnxruntime/third_party/glog/src/utilities.h b/runtime/onnxruntime/third_party/glog/src/utilities.h
index ae34d8d..45e555b 100644
--- a/runtime/onnxruntime/third_party/glog/src/utilities.h
+++ b/runtime/onnxruntime/third_party/glog/src/utilities.h
@@ -29,7 +29,7 @@
//
// Author: Shinichiro Hamaji
//
-// Define utilities for glog internal usage.
+// Define utilties for glog internal usage.
#ifndef UTILITIES_H__
#define UTILITIES_H__
@@ -52,10 +52,11 @@
#define PRIXS __PRIS_PREFIX "X"
#define PRIoS __PRIS_PREFIX "o"
+#include "base/mutex.h" // This must go first so we get _XOPEN_SOURCE
+
#include <string>
-#include "base/mutex.h" // This must go first so we get _XOPEN_SOURCE
-#include "glog/logging.h"
+#include <glog/logging.h>
#if defined(GLOG_OS_WINDOWS)
# include "port.h"
@@ -173,7 +174,7 @@
:"=a"(ret)
// GCC may produces %sil or %dil for
// constraint "r", but some of apple's gas
- // doesn't know the 8 bit registers.
+ // dosn't know the 8 bit registers.
// We use "q" to avoid these registers.
:"q"(newval), "q"(ptr), "a"(oldval)
:"memory", "cc");
--
Gitblit v1.9.1