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

fix spurious warnings with MSVC /Wall (fixes #94)

Browse Source
This commit is contained in:
Mark Gillard 2021-04-23 00:51:25 +03:00
parent 14682c1ece
commit 2cee913b6d
8 changed files with 75 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
external/dox vendored

@ -1 +1 @@
Subproject commit 4925ecf025697a68915a3312f82d52645e2f7e82
Subproject commit e471b3385fe8033faaa2d12db956edaddcea0c63

1
include/toml++/toml_formatter.h
View File

@ -190,6 +190,7 @@ TOML_IMPL_NAMESPACE_START
case value_flags::format_as_binary: print_to_stream("0b"sv, *stream_); break;
case value_flags::format_as_octal: print_to_stream("0o"sv, *stream_); break;
case value_flags::format_as_hexadecimal: print_to_stream("0x"sv, *stream_); break;
TOML_NO_DEFAULT_CASE;
}
print_to_stream(*val, *stream_, fmt);
}

2
include/toml++/toml_parser.h
View File

@ -701,7 +701,7 @@ TOML_NAMESPACE_START
// open file with a custom-sized stack buffer
using ifstream = std::basic_ifstream<StreamChar>;
ifstream file;
StreamChar file_buffer[sizeof(void*) * 4096_sz];
StreamChar file_buffer[sizeof(void*) * 1024_sz];
file.rdbuf()->pubsetbuf(file_buffer, sizeof(file_buffer));
file.open(file_path_str, ifstream::in | ifstream::binary | ifstream::ate);
if (!file.is_open())

12
include/toml++/toml_parser.hpp
View File

@ -29,6 +29,7 @@ TOML_DISABLE_WARNINGS;
TOML_ENABLE_WARNINGS;
TOML_PUSH_WARNINGS;
TOML_DISABLE_SPAM_WARNINGS;
TOML_DISABLE_SWITCH_WARNINGS;
#if TOML_EXCEPTIONS && !defined(__INTELLISENSE__)
@ -1405,7 +1406,7 @@ TOML_IMPL_NAMESPACE_START
for (int fragment_idx = 0; fragment_idx < 3; fragment_idx++)
{
auto& f = fragments[fragment_idx];
const uint32_t base = fragment_idx == 2 ? 10 : 16;
const uint32_t base = fragment_idx == 2 ? 10u : 16u;
// left-trim zeroes
const char* c = f.chars;
@ -1459,6 +1460,11 @@ TOML_IMPL_NAMESPACE_START
#endif // !TOML_LANG_UNRELEASED
}
TOML_PUSH_WARNINGS;
#if TOML_MSVC
#pragma warning(disable: 6001) // false positive
#endif
template <uint64_t base>
[[nodiscard]]
int64_t parse_integer() TOML_MAY_THROW
@ -1580,6 +1586,8 @@ TOML_IMPL_NAMESPACE_START
return static_cast<int64_t>(result);
}
TOML_POP_WARNINGS;
[[nodiscard]]
date parse_date(bool part_of_datetime = false) TOML_MAY_THROW
{
@ -3118,4 +3126,4 @@ TOML_NAMESPACE_START
}
TOML_NAMESPACE_END;
TOML_POP_WARNINGS; // TOML_DISABLE_SWITCH_WARNINGS
TOML_POP_WARNINGS; // TOML_DISABLE_SPAM_WARNINGS, TOML_DISABLE_SWITCH_WARNINGS

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

@ -133,14 +133,31 @@
#define TOML_PUSH_WARNINGS __pragma(warning(push)) \
static_assert(true)
#define TOML_DISABLE_SWITCH_WARNINGS __pragma(warning(disable: 4063)) \
#define TOML_DISABLE_SWITCH_WARNINGS __pragma(warning(disable: 4061)) \
__pragma(warning(disable: 4063)) \
__pragma(warning(disable: 26819)) \
static_assert(true)
#define TOML_DISABLE_SPAM_WARNINGS __pragma(warning(disable: 4127)) /* conditional expr is constant */ \
__pragma(warning(disable: 4324)) /* structure was padded due to alignment specifier */ \
__pragma(warning(disable: 4348)) \
__pragma(warning(disable: 4505)) /* unreferenced local function removed */ \
__pragma(warning(disable: 26490)) /* cg: dont use reinterpret_cast */ \
__pragma(warning(disable: 4514)) /* unreferenced inline function has been removed */ \
__pragma(warning(disable: 4623)) /* default constructor was implicitly defined as deleted */ \
__pragma(warning(disable: 4625)) /* copy constructor was implicitly defined as deleted */ \
__pragma(warning(disable: 4626)) /* assignment operator was implicitly defined as deleted */ \
__pragma(warning(disable: 4710)) /* function not inlined */ \
__pragma(warning(disable: 4711)) /* function selected for automatic expansion */ \
__pragma(warning(disable: 4820)) /* N bytes padding added */ \
__pragma(warning(disable: 4946)) /* reinterpret_cast used between related classes */ \
__pragma(warning(disable: 5026)) /* move constructor was implicitly defined as deleted */ \
__pragma(warning(disable: 5027)) /* move assignment operator was implicitly defined as deleted */ \
__pragma(warning(disable: 5045)) /* Compiler will insert Spectre mitigation */ \
__pragma(warning(disable: 26451)) \
__pragma(warning(disable: 26490)) \
__pragma(warning(disable: 26495)) \
__pragma(warning(disable: 26812)) \
__pragma(warning(disable: 26819)) \
static_assert(true)
#define TOML_POP_WARNINGS __pragma(warning(pop)) \

6
include/toml++/toml_utf8.h
View File

@ -4,6 +4,10 @@
// SPDX-License-Identifier: MIT
#pragma once
#include "toml_preprocessor.h"
TOML_PUSH_WARNINGS;
TOML_DISABLE_SWITCH_WARNINGS;
/// \cond
TOML_IMPL_NAMESPACE_START
@ -966,3 +970,5 @@ TOML_IMPL_NAMESPACE_START
}
TOML_IMPL_NAMESPACE_END;
/// \endcond
TOML_POP_WARNINGS; // TOML_DISABLE_SWITCH_WARNINGS

41
toml.hpp
View File

@ -161,14 +161,31 @@
#define TOML_PUSH_WARNINGS __pragma(warning(push)) \
static_assert(true)
#define TOML_DISABLE_SWITCH_WARNINGS __pragma(warning(disable: 4063)) \
#define TOML_DISABLE_SWITCH_WARNINGS __pragma(warning(disable: 4061)) \
__pragma(warning(disable: 4063)) \
__pragma(warning(disable: 26819)) \
static_assert(true)
#define TOML_DISABLE_SPAM_WARNINGS __pragma(warning(disable: 4127)) /* conditional expr is constant */ \
__pragma(warning(disable: 4324)) /* structure was padded due to alignment specifier */ \
__pragma(warning(disable: 4348)) \
__pragma(warning(disable: 4505)) /* unreferenced local function removed */ \
__pragma(warning(disable: 26490)) /* cg: dont use reinterpret_cast */ \
__pragma(warning(disable: 4514)) /* unreferenced inline function has been removed */ \
__pragma(warning(disable: 4623)) /* default constructor was implicitly defined as deleted */ \
__pragma(warning(disable: 4625)) /* copy constructor was implicitly defined as deleted */ \
__pragma(warning(disable: 4626)) /* assignment operator was implicitly defined as deleted */ \
__pragma(warning(disable: 4710)) /* function not inlined */ \
__pragma(warning(disable: 4711)) /* function selected for automatic expansion */ \
__pragma(warning(disable: 4820)) /* N bytes padding added */ \
__pragma(warning(disable: 4946)) /* reinterpret_cast used between related classes */ \
__pragma(warning(disable: 5026)) /* move constructor was implicitly defined as deleted */ \
__pragma(warning(disable: 5027)) /* move assignment operator was implicitly defined as deleted */ \
__pragma(warning(disable: 5045)) /* Compiler will insert Spectre mitigation */ \
__pragma(warning(disable: 26451)) \
__pragma(warning(disable: 26490)) \
__pragma(warning(disable: 26495)) \
__pragma(warning(disable: 26812)) \
__pragma(warning(disable: 26819)) \
static_assert(true)
#define TOML_POP_WARNINGS __pragma(warning(pop)) \
@ -5069,6 +5086,9 @@ TOML_POP_WARNINGS; // TOML_DISABLE_ARITHMETIC_WARNINGS
#if 1 //----------------------------------- ↓ toml_utf8.h -----------------------------------------------------------
TOML_PUSH_WARNINGS;
TOML_DISABLE_SWITCH_WARNINGS;
TOML_IMPL_NAMESPACE_START
{
[[nodiscard]]
@ -6023,6 +6043,8 @@ TOML_IMPL_NAMESPACE_START
}
TOML_IMPL_NAMESPACE_END;
TOML_POP_WARNINGS; // TOML_DISABLE_SWITCH_WARNINGS
#endif //----------------------------------- ↑ toml_utf8.h -----------------------------------------------------------
#if 1 //--------------------------------------------------------- ↓ toml_formatter.h --------------------------------
@ -6209,6 +6231,7 @@ TOML_IMPL_NAMESPACE_START
case value_flags::format_as_binary: print_to_stream("0b"sv, *stream_); break;
case value_flags::format_as_octal: print_to_stream("0o"sv, *stream_); break;
case value_flags::format_as_hexadecimal: print_to_stream("0x"sv, *stream_); break;
TOML_NO_DEFAULT_CASE;
}
print_to_stream(*val, *stream_, fmt);
}
@ -7584,7 +7607,7 @@ TOML_NAMESPACE_START
// open file with a custom-sized stack buffer
using ifstream = std::basic_ifstream<StreamChar>;
ifstream file;
StreamChar file_buffer[sizeof(void*) * 4096_sz];
StreamChar file_buffer[sizeof(void*) * 1024_sz];
file.rdbuf()->pubsetbuf(file_buffer, sizeof(file_buffer));
file.open(file_path_str, ifstream::in | ifstream::binary | ifstream::ate);
if (!file.is_open())
@ -8877,6 +8900,7 @@ TOML_DISABLE_WARNINGS;
TOML_ENABLE_WARNINGS;
TOML_PUSH_WARNINGS;
TOML_DISABLE_SPAM_WARNINGS;
TOML_DISABLE_SWITCH_WARNINGS;
#if TOML_EXCEPTIONS && !defined(__INTELLISENSE__)
@ -10253,7 +10277,7 @@ TOML_IMPL_NAMESPACE_START
for (int fragment_idx = 0; fragment_idx < 3; fragment_idx++)
{
auto& f = fragments[fragment_idx];
const uint32_t base = fragment_idx == 2 ? 10 : 16;
const uint32_t base = fragment_idx == 2 ? 10u : 16u;
// left-trim zeroes
const char* c = f.chars;
@ -10307,6 +10331,11 @@ TOML_IMPL_NAMESPACE_START
#endif // !TOML_LANG_UNRELEASED
}
TOML_PUSH_WARNINGS;
#if TOML_MSVC
#pragma warning(disable: 6001) // false positive
#endif
template <uint64_t base>
[[nodiscard]]
int64_t parse_integer() TOML_MAY_THROW
@ -10428,6 +10457,8 @@ TOML_IMPL_NAMESPACE_START
return static_cast<int64_t>(result);
}
TOML_POP_WARNINGS;
[[nodiscard]]
date parse_date(bool part_of_datetime = false) TOML_MAY_THROW
{
@ -11961,7 +11992,7 @@ TOML_NAMESPACE_START
}
TOML_NAMESPACE_END;
TOML_POP_WARNINGS; // TOML_DISABLE_SWITCH_WARNINGS
TOML_POP_WARNINGS; // TOML_DISABLE_SPAM_WARNINGS, TOML_DISABLE_SWITCH_WARNINGS
#endif //---------------------------------------------------------- ↑ toml_parser.hpp --------------------------------

2
tools/requirements.txt
View File

@ -1,3 +1,3 @@
misk>=0.3.0
misk>=0.4.0
pyyaml
python-dateutil