External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🚨 fix C4100 warnings

Browse Source
This commit is contained in:
Niels Lohmann 2021-08-13 17:03:55 +02:00
parent 288cdf9af7
commit 4b0e04eb68
No known key found for this signature in database
GPG Key ID: 7F3CEA63AE251B69
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/src/unit-allocator.cpp
View File

@ -100,9 +100,6 @@ struct my_allocator : std::allocator<T>
std::allocator<T>::deallocate(p, n);
}
// the code below warns about p in MSVC 2015 - this could be a bug
DOCTEST_MSVC_SUPPRESS_WARNING_PUSH
DOCTEST_MSVC_SUPPRESS_WARNING(4100)
void destroy(T* p)
{
if (next_destroy_fails)
@ -111,9 +108,9 @@ struct my_allocator : std::allocator<T>
throw std::bad_alloc();
}
static_cast<void>(p); // fix MSVC's C4100 warning
p->~T();
}
DOCTEST_MSVC_SUPPRESS_WARNING_POP
template <class U>
struct rebind

11
test/src/unit-udt.cpp
View File

@ -809,10 +809,6 @@ TEST_CASE("an incomplete type does not trigger a compiler error in non-evaluated
static_assert(!is_constructible_patched<json, incomplete>::value, "");
}
// the code below warns about t in MSVC 2015 - this could be a bug
DOCTEST_MSVC_SUPPRESS_WARNING_PUSH
DOCTEST_MSVC_SUPPRESS_WARNING(4100)
namespace
{
class Evil
@ -820,13 +816,14 @@ class Evil
public:
Evil() = default;
template <typename T>
Evil(T t) : m_i(sizeof(t)) {}
Evil(T t) : m_i(sizeof(t))
{
static_cast<void>(t); // fix MSVC's C4100 warning
}
int m_i = 0;
};
DOCTEST_MSVC_SUPPRESS_WARNING_POP
void from_json(const json& /*unused*/, Evil& /*unused*/) {}
} // namespace