From 87be68cd6c4968fb8b6e6b6d1dabadc1ff978b81 Mon Sep 17 00:00:00 2001 From: Random06457 <28494085+Random06457@users.noreply.github.com> Date: Wed, 4 May 2022 00:18:24 +0900 Subject: [PATCH] fix Windows build --- ZAPDTR/ZAPD/OutputFormatter.cpp | 2 +- ZAPDTR/ZAPD/OutputFormatter.h | 2 +- soh/soh.vcxproj | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ZAPDTR/ZAPD/OutputFormatter.cpp b/ZAPDTR/ZAPD/OutputFormatter.cpp index aed57d48f..362ef98fc 100644 --- a/ZAPDTR/ZAPD/OutputFormatter.cpp +++ b/ZAPDTR/ZAPD/OutputFormatter.cpp @@ -96,7 +96,7 @@ int OutputFormatter::Write(const std::string& buf) return Write(buf.data(), buf.size()); } -__thread OutputFormatter* OutputFormatter::Instance; +thread_local OutputFormatter* OutputFormatter::Instance; int OutputFormatter::WriteStatic(const char* buf, int count) { diff --git a/ZAPDTR/ZAPD/OutputFormatter.h b/ZAPDTR/ZAPD/OutputFormatter.h index 2d05765fb..03abfdb96 100644 --- a/ZAPDTR/ZAPD/OutputFormatter.h +++ b/ZAPDTR/ZAPD/OutputFormatter.h @@ -25,7 +25,7 @@ private: void Flush(); - static __thread OutputFormatter* Instance; + static thread_local OutputFormatter* Instance; static int WriteStatic(const char* buf, int count); public: diff --git a/soh/soh.vcxproj b/soh/soh.vcxproj index 2bd4380b9..418fdd057 100644 --- a/soh/soh.vcxproj +++ b/soh/soh.vcxproj @@ -278,6 +278,7 @@ +