Cheri-research/snmalloc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fatal error making less C for C++20. (#574)

Browse Source
This commit is contained in:
David CARLIER
2022-12-09 20:29:00 +00:00
committed by GitHub
parent 0a5eb403ad
commit dd3f4a9037
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/snmalloc/ds_core/defines.h
View File

@@ -109,6 +109,16 @@ namespace snmalloc
#define TOSTRING(expr) TOSTRING2(expr)
#define TOSTRING2(expr) #expr
#if (defined(__GNUC__) && !defined(__clang__) && __GNUC__ >= 11) || \
(defined(__clang__) && __clang_major__ >= 15)
# include <source_location>
# define SNMALLOC_CURRENT_LINE std::source_location::current().line()
# define SNMALLOC_CURRENT_FILE std::source_location::current().file_name()
#else
# define SNMALLOC_CURRENT_LINE TOSTRING(__LINE__)
# define SNMALLOC_CURRENT_FILE __FILE__
#endif
#ifdef NDEBUG
# define SNMALLOC_ASSERT_MSG(...) \
{}
@@ -121,8 +131,8 @@ namespace snmalloc
snmalloc::report_fatal_error( \
"assert fail: {} in {} on {} " fmt "\n", \
#expr, \
__FILE__, \
TOSTRING(__LINE__), \
SNMALLOC_CURRENT_FILE, \
SNMALLOC_CURRENT_LINE, \
##__VA_ARGS__); \
} \
} while (0)
@@ -137,8 +147,8 @@ namespace snmalloc
snmalloc::report_fatal_error( \
"Check fail: {} in {} on {} " fmt "\n", \
#expr, \
__FILE__, \
TOSTRING(__LINE__), \
SNMALLOC_CURRENT_FILE, \
SNMALLOC_CURRENT_LINE, \
##__VA_ARGS__); \
} \
} while (0)