mirror/tomlplusplus
1
0
Fork 0
mirror of https://github.com/marzer/tomlplusplus.git synced 2024-09-15 15:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed compile failure on apple clang

Browse Source 
also:
- updated conformance tests
- updated submodules
- updated windows test targets
This commit is contained in:
Mark Gillard 2020-12-19 13:27:22 +02:00
parent 05f8b1f1cc
commit bd1545a2f6
39 changed files with 50 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extern/mcss vendored

@ -1 +1 @@
Subproject commit de86049b87f8dc12c022406c201abb533bc78f68
Subproject commit 42d4a9a48f31f5df6e246c948403b54b50574a2a

2
extern/toml-test vendored

@ -1 +1 @@
Subproject commit 6538e544c3c32ca5134769fbd6dd1005f29a0c26
Subproject commit 9767d201b51ac9c50630f181828bcd922bf3e9e5

7
include/toml++/toml_preprocessor.h
View File

@ -319,10 +319,13 @@ is no longer necessary.
#define TOML_MAY_THROW noexcept
#endif
#if TOML_GCC || TOML_CLANG // fp charconv not in supported gcc or clang as of 26/11/2020
#if TOML_GCC || TOML_CLANG
// fp charconv not in supported any version of gcc or clang as of 26/11/2020
#define TOML_FLOAT_CHARCONV 0
#endif
#if defined(__EMSCRIPTEN__) // causes link errors on emscripten
#if defined(__EMSCRIPTEN__) || defined(__APPLE__)
// causes link errors on emscripten
// causes Mac OS SDK version errors on some versions of Apple Clang
#define TOML_INT_CHARCONV 0
#endif
#ifndef TOML_INT_CHARCONV

1
python/generate_windows_test_targets.py
View File

@ -122,6 +122,7 @@ def main():
</ClCompile>
<ClCompile Include="..\..\tests\unicode.cpp" />
<ClCompile Include="..\..\tests\user_feedback.cpp" />
<ClCompile Include="..\..\tests\using_iterators.cpp" />
<ClCompile Include="..\..\tests\windows_compat.cpp" />
</ItemGroup>
<ItemGroup>

4
tests/conformance_burntsushi_invalid.cpp
View File

@ -12,6 +12,8 @@ TOML_DISABLE_WARNINGS // unused variable spam
namespace
{
static constexpr auto bool_wrong_case_false = R"(b = FALSE)"sv;
static constexpr auto bool_wrong_case_true = R"(a = TRUE)"sv;
static constexpr auto datetime_malformed_no_leads = R"(no-leads = 1987-7-05T17:45:00Z)"sv;
static constexpr auto datetime_malformed_no_secs = R"(no-secs = 1987-07-05T17:45Z)"sv;
static constexpr auto datetime_malformed_no_t = R"(no-t = 1987-07-0517:45:00Z)"sv;
@ -123,6 +125,8 @@ TOML_ENABLE_WARNINGS
TEST_CASE("conformance - burntsushi/invalid")
{
parsing_should_fail(FILE_LINE_ARGS, bool_wrong_case_false);
parsing_should_fail(FILE_LINE_ARGS, bool_wrong_case_true);
parsing_should_fail(FILE_LINE_ARGS, datetime_malformed_no_leads);
parsing_should_fail(FILE_LINE_ARGS, datetime_malformed_no_t);
parsing_should_fail(FILE_LINE_ARGS, datetime_malformed_with_milli);

2
tests/using_iterators.cpp
View File

@ -4,7 +4,7 @@ TOML_DISABLE_WARNINGS
#include <algorithm>
TOML_ENABLE_WARNINGS
TEST_CASE("Using std::distance, std::count_if, etc. with Iterators")
TEST_CASE("using iterators")
{
constexpr auto data = R"(array=[1,"Foo",true]
string="Bar"

7
toml.hpp
View File

@ -333,10 +333,13 @@ is no longer necessary.
#define TOML_MAY_THROW noexcept
#endif
#if TOML_GCC || TOML_CLANG // fp charconv not in supported gcc or clang as of 26/11/2020
#if TOML_GCC || TOML_CLANG
// fp charconv not in supported any version of gcc or clang as of 26/11/2020
#define TOML_FLOAT_CHARCONV 0
#endif
#if defined(__EMSCRIPTEN__) // causes link errors on emscripten
#if defined(__EMSCRIPTEN__) || defined(__APPLE__)
// causes link errors on emscripten
// causes Mac OS SDK version errors on some versions of Apple Clang
#define TOML_INT_CHARCONV 0
#endif
#ifndef TOML_INT_CHARCONV

1
vs/tests/test_debug_x64.vcxproj
View File

@ -79,6 +79,7 @@
</ClCompile>
<ClCompile Include="..\..\tests\unicode.cpp" />
<ClCompile Include="..\..\tests\user_feedback.cpp" />
<ClCompile Include="..\..\tests\using_iterators.cpp" />
<ClCompile Include="..\..\tests\windows_compat.cpp" />
</ItemGroup>
<ItemGroup>

1
vs/tests/test_debug_x64_cpplatest.vcxproj
View File

@ -79,6 +79,7 @@
</ClCompile>
<ClCompile Include="..\..\tests\unicode.cpp" />
<ClCompile Include="..\..\tests\user_feedback.cpp" />
<ClCompile Include="..\..\tests\using_iterators.cpp" />
<ClCompile Include="..\..\tests\windows_compat.cpp" />
</ItemGroup>
<ItemGroup>

1
vs/tests/test_debug_x64_cpplatest_noexcept.vcxproj
View File

@ -79,6 +79,7 @@
</ClCompile>
<ClCompile Include="..\..\tests\unicode.cpp" />
<ClCompile Include="..\..\tests\user_feedback.cpp" />
<ClCompile Include="..\..\tests\using_iterators.cpp" />
<ClCompile Include="..\..\tests\windows_compat.cpp" />
</ItemGroup>
<ItemGroup>

1
vs/tests/test_debug_x64_cpplatest_noexcept_unrel.vcxproj
View File

@ -79,6 +79,7 @@
</ClCompile>
<ClCompile Include="..\..\tests\unicode.cpp" />
<ClCompile Include="..\..\tests\user_feedback.cpp" />
<ClCompile Include="..\..\tests\using_iterators.cpp" />
<ClCompile Include="..\..\tests\windows_compat.cpp" />
</ItemGroup>
<ItemGroup>

1
vs/tests/test_debug_x64_cpplatest_unrel.vcxproj
View File

@ -79,6 +79,7 @@
</ClCompile>
<ClCompile Include="..\..\tests\unicode.cpp" />
<ClCompile Include="..\..\tests\user_feedback.cpp" />
<ClCompile Include="..\..\tests\using_iterators.cpp" />
<ClCompile Include="..\..\tests\windows_compat.cpp" />
</ItemGroup>
<ItemGroup>

1
vs/tests/test_debug_x64_noexcept.vcxproj
View File

@ -79,6 +79,7 @@
</ClCompile>
<ClCompile Include="..\..\tests\unicode.cpp" />
<ClCompile Include="..\..\tests\user_feedback.cpp" />
<ClCompile Include="..\..\tests\using_iterators.cpp" />
<ClCompile Include="..\..\tests\windows_compat.cpp" />
</ItemGroup>
<ItemGroup>

1
vs/tests/test_debug_x64_noexcept_unrel.vcxproj
View File

@ -79,6 +79,7 @@
</ClCompile>
<ClCompile Include="..\..\tests\unicode.cpp" />
<ClCompile Include="..\..\tests\user_feedback.cpp" />
<ClCompile Include="..\..\tests\using_iterators.cpp" />
<ClCompile Include="..\..\tests\windows_compat.cpp" />
</ItemGroup>
<ItemGroup>

1
vs/tests/test_debug_x64_unrel.vcxproj
View File

@ -79,6 +79,7 @@
</ClCompile>
<ClCompile Include="..\..\tests\unicode.cpp" />
<ClCompile Include="..\..\tests\user_feedback.cpp" />
<ClCompile Include="..\..\tests\using_iterators.cpp" />
<ClCompile Include="..\..\tests\windows_compat.cpp" />
</ItemGroup>
<ItemGroup>

1
vs/tests/test_debug_x86.vcxproj
View File

@ -79,6 +79,7 @@
</ClCompile>
<ClCompile Include="..\..\tests\unicode.cpp" />
<ClCompile Include="..\..\tests\user_feedback.cpp" />
<ClCompile Include="..\..\tests\using_iterators.cpp" />
<ClCompile Include="..\..\tests\windows_compat.cpp" />
</ItemGroup>
<ItemGroup>

1
vs/tests/test_debug_x86_cpplatest.vcxproj
View File

@ -79,6 +79,7 @@
</ClCompile>
<ClCompile Include="..\..\tests\unicode.cpp" />
<ClCompile Include="..\..\tests\user_feedback.cpp" />
<ClCompile Include="..\..\tests\using_iterators.cpp" />
<ClCompile Include="..\..\tests\windows_compat.cpp" />
</ItemGroup>
<ItemGroup>

1
vs/tests/test_debug_x86_cpplatest_noexcept.vcxproj
View File

@ -79,6 +79,7 @@
</ClCompile>
<ClCompile Include="..\..\tests\unicode.cpp" />
<ClCompile Include="..\..\tests\user_feedback.cpp" />
<ClCompile Include="..\..\tests\using_iterators.cpp" />
<ClCompile Include="..\..\tests\windows_compat.cpp" />
</ItemGroup>
<ItemGroup>

1
vs/tests/test_debug_x86_cpplatest_noexcept_unrel.vcxproj
View File

@ -79,6 +79,7 @@
</ClCompile>
<ClCompile Include="..\..\tests\unicode.cpp" />
<ClCompile Include="..\..\tests\user_feedback.cpp" />
<ClCompile Include="..\..\tests\using_iterators.cpp" />
<ClCompile Include="..\..\tests\windows_compat.cpp" />
</ItemGroup>
<ItemGroup>

1
vs/tests/test_debug_x86_cpplatest_unrel.vcxproj
View File

@ -79,6 +79,7 @@
</ClCompile>
<ClCompile Include="..\..\tests\unicode.cpp" />
<ClCompile Include="..\..\tests\user_feedback.cpp" />
<ClCompile Include="..\..\tests\using_iterators.cpp" />
<ClCompile Include="..\..\tests\windows_compat.cpp" />
</ItemGroup>
<ItemGroup>

1
vs/tests/test_debug_x86_noexcept.vcxproj
View File

@ -79,6 +79,7 @@
</ClCompile>
<ClCompile Include="..\..\tests\unicode.cpp" />
<ClCompile Include="..\..\tests\user_feedback.cpp" />
<ClCompile Include="..\..\tests\using_iterators.cpp" />
<ClCompile Include="..\..\tests\windows_compat.cpp" />
</ItemGroup>
<ItemGroup>

1
vs/tests/test_debug_x86_noexcept_unrel.vcxproj
View File

@ -79,6 +79,7 @@
</ClCompile>
<ClCompile Include="..\..\tests\unicode.cpp" />
<ClCompile Include="..\..\tests\user_feedback.cpp" />
<ClCompile Include="..\..\tests\using_iterators.cpp" />
<ClCompile Include="..\..\tests\windows_compat.cpp" />
</ItemGroup>
<ItemGroup>

1
vs/tests/test_debug_x86_unrel.vcxproj
View File

@ -79,6 +79,7 @@
</ClCompile>
<ClCompile Include="..\..\tests\unicode.cpp" />
<ClCompile Include="..\..\tests\user_feedback.cpp" />
<ClCompile Include="..\..\tests\using_iterators.cpp" />
<ClCompile Include="..\..\tests\windows_compat.cpp" />
</ItemGroup>
<ItemGroup>

1
vs/tests/test_release_x64.vcxproj
View File

@ -79,6 +79,7 @@
</ClCompile>
<ClCompile Include="..\..\tests\unicode.cpp" />
<ClCompile Include="..\..\tests\user_feedback.cpp" />
<ClCompile Include="..\..\tests\using_iterators.cpp" />
<ClCompile Include="..\..\tests\windows_compat.cpp" />
</ItemGroup>
<ItemGroup>

1
vs/tests/test_release_x64_cpplatest.vcxproj
View File

@ -79,6 +79,7 @@
</ClCompile>
<ClCompile Include="..\..\tests\unicode.cpp" />
<ClCompile Include="..\..\tests\user_feedback.cpp" />
<ClCompile Include="..\..\tests\using_iterators.cpp" />
<ClCompile Include="..\..\tests\windows_compat.cpp" />
</ItemGroup>
<ItemGroup>

1
vs/tests/test_release_x64_cpplatest_noexcept.vcxproj
View File

@ -79,6 +79,7 @@
</ClCompile>
<ClCompile Include="..\..\tests\unicode.cpp" />
<ClCompile Include="..\..\tests\user_feedback.cpp" />
<ClCompile Include="..\..\tests\using_iterators.cpp" />
<ClCompile Include="..\..\tests\windows_compat.cpp" />
</ItemGroup>
<ItemGroup>

1
vs/tests/test_release_x64_cpplatest_noexcept_unrel.vcxproj
View File

@ -79,6 +79,7 @@
</ClCompile>
<ClCompile Include="..\..\tests\unicode.cpp" />
<ClCompile Include="..\..\tests\user_feedback.cpp" />
<ClCompile Include="..\..\tests\using_iterators.cpp" />
<ClCompile Include="..\..\tests\windows_compat.cpp" />
</ItemGroup>
<ItemGroup>

1
vs/tests/test_release_x64_cpplatest_unrel.vcxproj
View File

@ -79,6 +79,7 @@
</ClCompile>
<ClCompile Include="..\..\tests\unicode.cpp" />
<ClCompile Include="..\..\tests\user_feedback.cpp" />
<ClCompile Include="..\..\tests\using_iterators.cpp" />
<ClCompile Include="..\..\tests\windows_compat.cpp" />
</ItemGroup>
<ItemGroup>

1
vs/tests/test_release_x64_noexcept.vcxproj
View File

@ -79,6 +79,7 @@
</ClCompile>
<ClCompile Include="..\..\tests\unicode.cpp" />
<ClCompile Include="..\..\tests\user_feedback.cpp" />
<ClCompile Include="..\..\tests\using_iterators.cpp" />
<ClCompile Include="..\..\tests\windows_compat.cpp" />
</ItemGroup>
<ItemGroup>

1
vs/tests/test_release_x64_noexcept_unrel.vcxproj
View File

@ -79,6 +79,7 @@
</ClCompile>
<ClCompile Include="..\..\tests\unicode.cpp" />
<ClCompile Include="..\..\tests\user_feedback.cpp" />
<ClCompile Include="..\..\tests\using_iterators.cpp" />
<ClCompile Include="..\..\tests\windows_compat.cpp" />
</ItemGroup>
<ItemGroup>

1
vs/tests/test_release_x64_unrel.vcxproj
View File

@ -79,6 +79,7 @@
</ClCompile>
<ClCompile Include="..\..\tests\unicode.cpp" />
<ClCompile Include="..\..\tests\user_feedback.cpp" />
<ClCompile Include="..\..\tests\using_iterators.cpp" />
<ClCompile Include="..\..\tests\windows_compat.cpp" />
</ItemGroup>
<ItemGroup>

1
vs/tests/test_release_x86.vcxproj
View File

@ -79,6 +79,7 @@
</ClCompile>
<ClCompile Include="..\..\tests\unicode.cpp" />
<ClCompile Include="..\..\tests\user_feedback.cpp" />
<ClCompile Include="..\..\tests\using_iterators.cpp" />
<ClCompile Include="..\..\tests\windows_compat.cpp" />
</ItemGroup>
<ItemGroup>

1
vs/tests/test_release_x86_cpplatest.vcxproj
View File

@ -79,6 +79,7 @@
</ClCompile>
<ClCompile Include="..\..\tests\unicode.cpp" />
<ClCompile Include="..\..\tests\user_feedback.cpp" />
<ClCompile Include="..\..\tests\using_iterators.cpp" />
<ClCompile Include="..\..\tests\windows_compat.cpp" />
</ItemGroup>
<ItemGroup>

1
vs/tests/test_release_x86_cpplatest_noexcept.vcxproj
View File

@ -79,6 +79,7 @@
</ClCompile>
<ClCompile Include="..\..\tests\unicode.cpp" />
<ClCompile Include="..\..\tests\user_feedback.cpp" />
<ClCompile Include="..\..\tests\using_iterators.cpp" />
<ClCompile Include="..\..\tests\windows_compat.cpp" />
</ItemGroup>
<ItemGroup>

1
vs/tests/test_release_x86_cpplatest_noexcept_unrel.vcxproj
View File

@ -79,6 +79,7 @@
</ClCompile>
<ClCompile Include="..\..\tests\unicode.cpp" />
<ClCompile Include="..\..\tests\user_feedback.cpp" />
<ClCompile Include="..\..\tests\using_iterators.cpp" />
<ClCompile Include="..\..\tests\windows_compat.cpp" />
</ItemGroup>
<ItemGroup>

1
vs/tests/test_release_x86_cpplatest_unrel.vcxproj
View File

@ -79,6 +79,7 @@
</ClCompile>
<ClCompile Include="..\..\tests\unicode.cpp" />
<ClCompile Include="..\..\tests\user_feedback.cpp" />
<ClCompile Include="..\..\tests\using_iterators.cpp" />
<ClCompile Include="..\..\tests\windows_compat.cpp" />
</ItemGroup>
<ItemGroup>

1
vs/tests/test_release_x86_noexcept.vcxproj
View File

@ -79,6 +79,7 @@
</ClCompile>
<ClCompile Include="..\..\tests\unicode.cpp" />
<ClCompile Include="..\..\tests\user_feedback.cpp" />
<ClCompile Include="..\..\tests\using_iterators.cpp" />
<ClCompile Include="..\..\tests\windows_compat.cpp" />
</ItemGroup>
<ItemGroup>

1
vs/tests/test_release_x86_noexcept_unrel.vcxproj
View File

@ -79,6 +79,7 @@
</ClCompile>
<ClCompile Include="..\..\tests\unicode.cpp" />
<ClCompile Include="..\..\tests\user_feedback.cpp" />
<ClCompile Include="..\..\tests\using_iterators.cpp" />
<ClCompile Include="..\..\tests\windows_compat.cpp" />
</ItemGroup>
<ItemGroup>

1
vs/tests/test_release_x86_unrel.vcxproj
View File

@ -79,6 +79,7 @@
</ClCompile>
<ClCompile Include="..\..\tests\unicode.cpp" />
<ClCompile Include="..\..\tests\user_feedback.cpp" />
<ClCompile Include="..\..\tests\using_iterators.cpp" />
<ClCompile Include="..\..\tests\windows_compat.cpp" />
</ItemGroup>
<ItemGroup>