This commit is contained in:
Neargye 2018-05-13 23:03:32 +05:00
parent e721c28d40
commit 4f48107812

View file

@ -53,12 +53,12 @@ inline constexpr const char* Nameof(const char* name, const ::std::size_t length
#if defined(__GNUC__) || defined(__clang__) #if defined(__GNUC__) || defined(__clang__)
// Used to obtain the string name of a variable, type, member, function, macros. // Used to obtain the string name of a variable, type, member, function, macros.
# define NAMEOF(name) ::nameof::Nameof(#name, sizeof(#name) / sizeof(char) - 1 + (0 * sizeof(void(*)(__typeof__(name))))) # define NAMEOF(name) ::nameof::Nameof(#name, (((sizeof(#name) / sizeof(char)) - 1) + (0 * sizeof(void(*)(__typeof__(name))))))
// Used to obtain the string full name of a variable, type, member, function, macros. // Used to obtain the string full name of a variable, type, member, function, macros.
# define NAMEOF_FULL(name) ::nameof::Nameof(#name, (0 * sizeof(void(*)(__typeof__(name))))) # define NAMEOF_FULL(name) ::nameof::Nameof(#name, (0 * sizeof(void(*)(__typeof__(name)))))
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
// Used to obtain the string name of a variable, type, member, function, macros. // Used to obtain the string name of a variable, type, member, function, macros.
# define NAMEOF(name) ::nameof::Nameof(#name, sizeof(#name) / sizeof(char) - 1 + (0 * sizeof(typeid(name)))) # define NAMEOF(name) ::nameof::Nameof(#name, (((sizeof(#name) / sizeof(char)) - 1) + (0 * sizeof(typeid(name)))))
// Used to obtain the string full name of a variable, type, member, function, macros. // Used to obtain the string full name of a variable, type, member, function, macros.
# define NAMEOF_FULL(name) ::nameof::Nameof(#name, (0 * sizeof(typeid(name)))) # define NAMEOF_FULL(name) ::nameof::Nameof(#name, (0 * sizeof(typeid(name))))
#endif #endif