mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Codechange: use std::source_location over __FILE__ and __LINE__ for NOT_REACHED

This commit is contained in:
Rubidium 2024-01-17 03:53:10 +01:00 committed by rubidium42
parent bab5a8a787
commit e4b3f3f495
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/error.cpp
View File

@ -10,12 +10,12 @@
#include "stdafx.h" #include "stdafx.h"
#include "error_func.h" #include "error_func.h"
[[noreturn]] void NotReachedError(int line, const char *file) [[noreturn]] void NOT_REACHED(const std::source_location location)
{ {
FatalError("NOT_REACHED triggered at line {} of {}", line, file); FatalError("NOT_REACHED triggered at line {} of {}", location.line(), location.file_name());
} }
[[noreturn]] void AssertFailedError(int line, const char *file, const char *expression) [[noreturn]] void AssertFailedError(const char *expression, const std::source_location location)
{ {
FatalError("Assertion failed at line {} of {}: {}", line, file, expression); FatalError("Assertion failed at line {} of {}: {}", location.line(), location.file_name(), expression);
} }

7
src/stdafx.h
View File

@ -349,14 +349,13 @@ static_assert(SIZE_MAX >= UINT32_MAX);
/* For the FMT library we only want to use the headers, not link to some library. */ /* For the FMT library we only want to use the headers, not link to some library. */
#define FMT_HEADER_ONLY #define FMT_HEADER_ONLY
[[noreturn]] void NotReachedError(int line, const char *file); [[noreturn]] void NOT_REACHED(const std::source_location location = std::source_location::current());
[[noreturn]] void AssertFailedError(int line, const char *file, const char *expression); [[noreturn]] void AssertFailedError(const char *expression, const std::source_location location = std::source_location::current());
#define NOT_REACHED() NotReachedError(__LINE__, __FILE__)
/* For non-debug builds with assertions enabled use the special assertion handler. */ /* For non-debug builds with assertions enabled use the special assertion handler. */
#if defined(NDEBUG) && defined(WITH_ASSERT) #if defined(NDEBUG) && defined(WITH_ASSERT)
# undef assert # undef assert
# define assert(expression) do { if (!(expression)) [[unlikely]] AssertFailedError(__LINE__, __FILE__, #expression); } while (false) # define assert(expression) do { if (!(expression)) [[unlikely]] AssertFailedError(#expression); } while (false)
#endif #endif
/* Define JSON_ASSERT, which is used by nlohmann-json. Otherwise the header-file /* Define JSON_ASSERT, which is used by nlohmann-json. Otherwise the header-file