From 73660d78df4972e393698dc6f7b1f71b8ee57c4e Mon Sep 17 00:00:00 2001
From: Xiang Zhang <xianz@microsoft.com>
Date: Tue, 27 Jul 2021 22:29:58 -0700
Subject: [PATCH] Fix WinML build warnings in HStringFromUTF8 (#8519)

---
 winml/lib/Api.Ort/OnnxruntimeModel.cpp |  2 +-
 winml/lib/Common/inc/StringHelpers.h   | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/winml/lib/Api.Ort/OnnxruntimeModel.cpp b/winml/lib/Api.Ort/OnnxruntimeModel.cpp
index 20287befc1..85310463b4 100644
--- a/winml/lib/Api.Ort/OnnxruntimeModel.cpp
+++ b/winml/lib/Api.Ort/OnnxruntimeModel.cpp
@@ -314,7 +314,7 @@ STDMETHODIMP OnnruntimeModel::AddOperator(
   return S_OK;
 }
 
-static ONNXTensorElementDataType
+inline ONNXTensorElementDataType
 ONNXTensorElementDataTypeFromTensorKind(winml::TensorKind kind) {
   switch (kind) {
     case winml::TensorKind::Boolean: {
diff --git a/winml/lib/Common/inc/StringHelpers.h b/winml/lib/Common/inc/StringHelpers.h
index 989e92b8dd..a321f494b3 100644
--- a/winml/lib/Common/inc/StringHelpers.h
+++ b/winml/lib/Common/inc/StringHelpers.h
@@ -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();