From 3bb14b5029becec85034f88dd66ca2d027134072 Mon Sep 17 00:00:00 2001
From: cdevelop <cdevelop@qq.com>
Date: 星期三, 11 十月 2023 15:15:14 +0800
Subject: [PATCH] 解决vc编译错误 (#987)
---
funasr/runtime/onnxruntime/src/commonfunc.h | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/funasr/runtime/onnxruntime/src/commonfunc.h b/funasr/runtime/onnxruntime/src/commonfunc.h
index d7e5f13..9bd2a00 100644
--- a/funasr/runtime/onnxruntime/src/commonfunc.h
+++ b/funasr/runtime/onnxruntime/src/commonfunc.h
@@ -1,29 +1,34 @@
#pragma once
#include <algorithm>
+#ifdef _WIN32
+#include <codecvt>
+#endif
namespace funasr {
typedef struct
{
- std::string msg="";
- std::string stamp="";
- std::string tpass_msg="";
- float snippet_time=0;
+ std::string msg;
+ std::string stamp;
+ std::string tpass_msg;
+ float snippet_time;
}FUNASR_RECOG_RESULT;
typedef struct
{
std::vector<std::vector<int>>* segments;
- float snippet_time=0;
+ float snippet_time;
}FUNASR_VAD_RESULT;
typedef struct
{
- string msg="";
+ string msg;
vector<string> arr_cache;
}FUNASR_PUNC_RESULT;
#ifdef _WIN32
-#include <codecvt>
+
+#define ORTSTRING(str) StrToWstr(str)
+#define ORTCHAR(str) StrToWstr(str).c_str()
inline std::wstring String2wstring(const std::string& str, const std::string& locale)
{
@@ -39,8 +44,15 @@
}
+#else
+
+#define ORTSTRING(str) str
+#define ORTCHAR(str) str
+
#endif
+
+
inline void GetInputName(Ort::Session* session, string& inputName,int nIndex=0) {
size_t numInputNodes = session->GetInputCount();
if (numInputNodes > 0) {
--
Gitblit v1.9.1