AuroraMiddleware/tomlplusplus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes for latest MSVC

Browse Source 
also:
- minor doc tweaks
This commit is contained in:
Mark Gillard 2022-10-14 13:18:24 +03:00
parent 4824a10031
commit 698ee0ecd1
7 changed files with 49 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.clang-format
View File

@ -31,7 +31,6 @@ AttributeMacros:
- TOML_EMPTY_BASES
- TOML_EXPORTED_CLASS
- TOML_FLAGS_ENUM
- TOML_LIKELY_CASE
- TOML_OPEN_ENUM
- TOML_OPEN_FLAGS_ENUM
- TOML_TRIVIAL_ABI
@ -175,6 +174,7 @@ StatementMacros:
- TOML_EXTERN
- TOML_EXTERNAL_LINKAGE
- TOML_INTERNAL_LINKAGE
- TOML_LIKELY_CASE
- TOML_MEMBER_ATTR
- TOML_NEVER_INLINE
- TOML_NODISCARD

4
docs/poxy.toml
View File

@ -18,7 +18,8 @@ extra_files = [
'images/badge-TOML.svg',
'images/badge-gitter.svg'
]
html_header = '<style>#poxy-main-banner, .poxy-main-banner { padding: 2rem; }</style>'
html_header = '<style>#poxy-main-banner { padding: 2rem; }</style>'
[warnings]
@ -55,7 +56,6 @@ paths = [ 'images' ]
[code_blocks]
macros = [ 'TOML_[A-Z0-9_]+?', 'print_value' ]
string_literals = [ '_toml' ]

3
include/toml++/impl/preprocessor.h
View File

@ -464,6 +464,7 @@
__pragma(warning(disable : 4061)) \
__pragma(warning(disable : 4062)) \
__pragma(warning(disable : 4063)) \
__pragma(warning(disable : 5262)) /* switch-case implicit fallthrough (false-positive) */ \
__pragma(warning(disable : 26819)) /* cg: unannotated fallthrough */ \
static_assert(true)
@ -486,6 +487,7 @@
__pragma(warning(disable : 5027)) /* move assignment operator was implicitly defined as deleted */ \
__pragma(warning(disable : 5039)) /* potentially throwing function passed to 'extern "C"' function */ \
__pragma(warning(disable : 5045)) /* Compiler will insert Spectre mitigation */ \
__pragma(warning(disable : 5264)) /* const variable is not used (false-positive) */ \
__pragma(warning(disable : 26451)) \
__pragma(warning(disable : 26490)) \
__pragma(warning(disable : 26495)) \
@ -508,6 +510,7 @@
__pragma(warning(disable : 4348)) \
__pragma(warning(disable : 4668)) \
__pragma(warning(disable : 5105)) \
__pragma(warning(disable : 5264)) \
TOML_DISABLE_CODE_ANALYSIS_WARNINGS; \
TOML_DISABLE_SWITCH_WARNINGS; \
TOML_DISABLE_SPAM_WARNINGS; \

2
tests/lib_catch2.h
View File

@ -20,6 +20,8 @@
#pragma warning(disable : 4365)
#pragma warning(disable : 4868)
#pragma warning(disable : 5105)
#pragma warning(disable : 5262)
#pragma warning(disable : 5264)
#endif
#if !defined(USE_VENDORED_LIBS) || USE_VENDORED_LIBS

5
tests/main.cpp
View File

@ -3,6 +3,11 @@
// See https://github.com/marzer/tomlplusplus/blob/master/LICENSE for the full license text.
// SPDX-License-Identifier: MIT
#ifdef _MSC_VER
#pragma warning(disable : 5262)
#pragma warning(disable : 5264)
#endif
#define CATCH_CONFIG_RUNNER
#include "lib_catch2.h"
#include <clocale>

3
toml.hpp
View File

@ -494,6 +494,7 @@
__pragma(warning(disable : 4061)) \
__pragma(warning(disable : 4062)) \
__pragma(warning(disable : 4063)) \
__pragma(warning(disable : 5262)) /* switch-case implicit fallthrough (false-positive) */ \
__pragma(warning(disable : 26819)) /* cg: unannotated fallthrough */ \
static_assert(true)
@ -516,6 +517,7 @@
__pragma(warning(disable : 5027)) /* move assignment operator was implicitly defined as deleted */ \
__pragma(warning(disable : 5039)) /* potentially throwing function passed to 'extern "C"' function */ \
__pragma(warning(disable : 5045)) /* Compiler will insert Spectre mitigation */ \
__pragma(warning(disable : 5264)) /* const variable is not used (false-positive) */ \
__pragma(warning(disable : 26451)) \
__pragma(warning(disable : 26490)) \
__pragma(warning(disable : 26495)) \
@ -538,6 +540,7 @@
__pragma(warning(disable : 4348)) \
__pragma(warning(disable : 4668)) \
__pragma(warning(disable : 5105)) \
__pragma(warning(disable : 5264)) \
TOML_DISABLE_CODE_ANALYSIS_WARNINGS; \
TOML_DISABLE_SWITCH_WARNINGS; \
TOML_DISABLE_SPAM_WARNINGS; \