Fix WinML build warnings in HStringFromUTF8 (#8519)

This commit is contained in:
Xiang Zhang 2021-07-27 22:29:58 -07:00 committed by GitHub
parent ceeb1a65d6
commit 73660d78df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions

View file

@ -314,7 +314,7 @@ STDMETHODIMP OnnruntimeModel::AddOperator(
return S_OK;
}
static ONNXTensorElementDataType
inline ONNXTensorElementDataType
ONNXTensorElementDataTypeFromTensorKind(winml::TensorKind kind) {
switch (kind) {
case winml::TensorKind::Boolean: {

View file

@ -35,7 +35,7 @@ struct HStringBuilder {
HSTRING_BUFFER buffer_{nullptr};
};
static winrt::hstring HStringFromUTF8(const char* input, size_t input_length) {
inline winrt::hstring HStringFromUTF8(const char* input, size_t input_length) {
if (input_length == 0) {
return {};
} else if (input_length <= (std::numeric_limits<size_t>::max)()) {
@ -52,17 +52,17 @@ static winrt::hstring HStringFromUTF8(const char* input, size_t input_length) {
}
}
static winrt::hstring HStringFromUTF8(const char* input) {
inline winrt::hstring HStringFromUTF8(const char* input) {
return input != nullptr
? HStringFromUTF8(input, strlen(input))
: L"";
}
static winrt::hstring HStringFromUTF8(const std::string& input) {
inline winrt::hstring HStringFromUTF8(const std::string& input) {
return HStringFromUTF8(input.c_str(), input.size());
}
static std::string UTF8FromUnicode(const wchar_t* input, size_t input_length) {
inline std::string UTF8FromUnicode(const wchar_t* input, size_t input_length) {
if (input_length == 0) {
return {};
} else if (input_length <= (std::numeric_limits<size_t>::max)()) {
@ -79,11 +79,11 @@ static std::string UTF8FromUnicode(const wchar_t* input, size_t input_length) {
}
}
static std::string UTF8FromHString(const winrt::hstring& input) {
inline std::string UTF8FromHString(const winrt::hstring& input) {
return UTF8FromUnicode(input.data(), input.size());
}
static std::wstring WStringFromString(const std::string& string) {
inline std::wstring WStringFromString(const std::string& string) {
std::wostringstream woss;
woss << string.data();
return woss.str();