fix warnings
This commit is contained in:
parent
7614db16d1
commit
fff49040ed
2 changed files with 35 additions and 25 deletions
|
@ -27,7 +27,7 @@
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
|
|
||||||
struct Base { virtual void foo() {} };
|
struct Base { virtual ~Base() = default; };
|
||||||
|
|
||||||
struct Derived : Base {};
|
struct Derived : Base {};
|
||||||
|
|
||||||
|
|
|
@ -49,9 +49,15 @@
|
||||||
#include <string>
|
#include <string>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(_MSC_VER)
|
#if defined(__clang__)
|
||||||
|
# pragma clang diagnostic push
|
||||||
|
# pragma clang diagnostic ignored "-Wsign-conversion" // Implicit conversion changes signedness: 'int' to 'size_t'.
|
||||||
|
#elif defined(__GNUC__)
|
||||||
|
# pragma GCC diagnostic push
|
||||||
|
# pragma GCC diagnostic ignored "-Wsign-conversion" // Implicit conversion changes signedness: 'int' to 'size_t'.
|
||||||
|
#elif defined(_MSC_VER)
|
||||||
# pragma warning(push)
|
# pragma warning(push)
|
||||||
# pragma warning(disable : 26495) // Variable 'nameof::cstring<N>::chars_' is uninitialized.
|
# pragma warning(disable : 26495) // Variable 'cstring<N>::chars_' is uninitialized.
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Checks nameof_type compiler compatibility.
|
// Checks nameof_type compiler compatibility.
|
||||||
|
@ -660,29 +666,29 @@ template <typename T>
|
||||||
// Obtains simple (unqualified) string name of variable, function, macro.
|
// Obtains simple (unqualified) string name of variable, function, macro.
|
||||||
#define NAMEOF(...) []() constexpr noexcept { \
|
#define NAMEOF(...) []() constexpr noexcept { \
|
||||||
::std::void_t<decltype(__VA_ARGS__)>(); \
|
::std::void_t<decltype(__VA_ARGS__)>(); \
|
||||||
constexpr auto name = ::nameof::detail::pretty_name(#__VA_ARGS__, true); \
|
constexpr auto __name = ::nameof::detail::pretty_name(#__VA_ARGS__, true); \
|
||||||
static_assert(name.size() > 0, "Expression does not have a name."); \
|
static_assert(__name.size() > 0, "Expression does not have a name."); \
|
||||||
constexpr auto size = name.size(); \
|
constexpr auto __size = __name.size(); \
|
||||||
constexpr auto nameof = ::nameof::cstring<size>{name}; \
|
constexpr auto __nameof = ::nameof::cstring<__size>{__name}; \
|
||||||
return nameof; }()
|
return __nameof; }()
|
||||||
|
|
||||||
// Obtains simple (unqualified) full (with template suffix) string name of variable, function, macro.
|
// Obtains simple (unqualified) full (with template suffix) string name of variable, function, macro.
|
||||||
#define NAMEOF_FULL(...) []() constexpr noexcept { \
|
#define NAMEOF_FULL(...) []() constexpr noexcept { \
|
||||||
::std::void_t<decltype(__VA_ARGS__)>(); \
|
::std::void_t<decltype(__VA_ARGS__)>(); \
|
||||||
constexpr auto name = ::nameof::detail::pretty_name(#__VA_ARGS__, false); \
|
constexpr auto __name = ::nameof::detail::pretty_name(#__VA_ARGS__, false); \
|
||||||
static_assert(name.size() > 0, "Expression does not have a name."); \
|
static_assert(__name.size() > 0, "Expression does not have a name."); \
|
||||||
constexpr auto size = name.size(); \
|
constexpr auto __size = __name.size(); \
|
||||||
constexpr auto nameof_full = ::nameof::cstring<size>{name}; \
|
constexpr auto __nameof_full = ::nameof::cstring<__size>{__name}; \
|
||||||
return nameof_full; }()
|
return __nameof_full; }()
|
||||||
|
|
||||||
// Obtains raw string name of variable, function, macro.
|
// Obtains raw string name of variable, function, macro.
|
||||||
#define NAMEOF_RAW(...) []() constexpr noexcept { \
|
#define NAMEOF_RAW(...) []() constexpr noexcept { \
|
||||||
::std::void_t<decltype(__VA_ARGS__)>(); \
|
::std::void_t<decltype(__VA_ARGS__)>(); \
|
||||||
constexpr auto name = ::std::string_view{#__VA_ARGS__}; \
|
constexpr auto __name = ::std::string_view{#__VA_ARGS__}; \
|
||||||
static_assert(name.size() > 0, "Expression does not have a name."); \
|
static_assert(__name.size() > 0, "Expression does not have a name."); \
|
||||||
constexpr auto size = name.size(); \
|
constexpr auto __size = __name.size(); \
|
||||||
constexpr auto nameof_raw = ::nameof::cstring<size>{name}; \
|
constexpr auto __nameof_raw = ::nameof::cstring<__size>{__name}; \
|
||||||
return nameof_raw; }()
|
return __nameof_raw; }()
|
||||||
|
|
||||||
// Obtains simple (unqualified) string enum name of enum variable.
|
// Obtains simple (unqualified) string enum name of enum variable.
|
||||||
#define NAMEOF_ENUM(...) ::nameof::nameof_enum<::std::decay_t<decltype(__VA_ARGS__)>>(__VA_ARGS__)
|
#define NAMEOF_ENUM(...) ::nameof::nameof_enum<::std::decay_t<decltype(__VA_ARGS__)>>(__VA_ARGS__)
|
||||||
|
@ -706,7 +712,11 @@ template <typename T>
|
||||||
// Obtains string name of type, using RTTI.
|
// Obtains string name of type, using RTTI.
|
||||||
#define NAMEOF_TYPE_RTTI(...) ::nameof::detail::demangle(typeid(__VA_ARGS__).name())
|
#define NAMEOF_TYPE_RTTI(...) ::nameof::detail::demangle(typeid(__VA_ARGS__).name())
|
||||||
|
|
||||||
#if defined(_MSC_VER)
|
#if defined(__clang__)
|
||||||
|
# pragma clang diagnostic pop
|
||||||
|
#elif defined(__GNUC__)
|
||||||
|
# pragma GCC diagnostic pop
|
||||||
|
#elif defined(_MSC_VER)
|
||||||
# pragma warning(pop)
|
# pragma warning(pop)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue