Skip to content

Fix Windows builds with Visual Studio 16.8 #231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
trflynn89 merged 1 commit into from
Nov 29, 2020
Merged

Fix Windows builds with Visual Studio 16.8 #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions build/win/libfly_unit_tests/libfly_unit_tests.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
<UseFullPaths>true</UseFullPaths>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpplatest</LanguageStandard>
<AdditionalOptions>/utf-8 /bigobj %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions>/utf-8 /bigobj /permissive %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
Expand All @@ -137,7 +137,7 @@
<UseFullPaths>true</UseFullPaths>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpplatest</LanguageStandard>
<AdditionalOptions>/utf-8 /bigobj %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions>/utf-8 /bigobj /permissive %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
Expand All @@ -159,7 +159,7 @@
<UseFullPaths>true</UseFullPaths>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpplatest</LanguageStandard>
<AdditionalOptions>/utf-8 /bigobj %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions>/utf-8 /bigobj /permissive %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
Expand All @@ -183,7 +183,7 @@
<UseFullPaths>true</UseFullPaths>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpplatest</LanguageStandard>
<AdditionalOptions>/utf-8 /bigobj %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions>/utf-8 /bigobj /permissive %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
Expand Down
12 changes: 8 additions & 4 deletions test/types/string_formatter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,17 +178,21 @@ CATCH_TEMPLATE_TEST_CASE(
format = FLY_STR(char_type, "%a");
CATCH_CHECK(FLY_STR(streamed_char, "%a") == BasicString::format(format));
#if defined(FLY_WINDOWS)
// Windows 0-pads std::hexfloat to match the stream precision, Linux and macOS do not.
CATCH_CHECK(FLY_STR(streamed_char, "0x1.600000p+2") == BasicString::format(format, 5.5));
// MSVC will always 0-pad std::hexfloat formatted strings. Clang and GCC do not.
// https://github.com/microsoft/STL/blob/0b81475cc8087a7b615911d65b52b6a1fad87d7d/stl/inc/xlocnum#L1156
CATCH_CHECK(
FLY_STR(streamed_char, "0x1.6000000000000p+2") == BasicString::format(format, 5.5));
#else
CATCH_CHECK(FLY_STR(streamed_char, "0x1.6p+2") == BasicString::format(format, 5.5));
#endif

format = FLY_STR(char_type, "%A");
CATCH_CHECK(FLY_STR(streamed_char, "%A") == BasicString::format(format));
#if defined(FLY_WINDOWS)
// Windows 0-pads std::hexfloat to match the stream precision, Linux and macOS do not.
CATCH_CHECK(FLY_STR(streamed_char, "0X1.600000P+2") == BasicString::format(format, 5.5));
// MSVC will always 0-pad std::hexfloat formatted strings. Clang and GCC do not.
// https://github.com/microsoft/STL/blob/0b81475cc8087a7b615911d65b52b6a1fad87d7d/stl/inc/xlocnum#L1156
CATCH_CHECK(
FLY_STR(streamed_char, "0X1.6000000000000P+2") == BasicString::format(format, 5.5));
#else
CATCH_CHECK(FLY_STR(streamed_char, "0X1.6P+2") == BasicString::format(format, 5.5));
#endif
Expand Down