diff options
| author | Andreas Haas <Hinsbart@users.noreply.github.com> | 2017-10-02 23:51:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-02 23:51:26 +0200 |
| commit | 132ba0ed9799db9ed1449fa2f2fc597d4b91612d (patch) | |
| tree | b0c62cdc864e64636fa6717438025fbd9a35fb04 /core/error_macros.cpp | |
| parent | de9cc6ed96c79c70ca9cf22830b3e42cca4f244b (diff) | |
| parent | 1a2311e3505765e37b736fe6bb46bb229e00701f (diff) | |
| download | redot-engine-132ba0ed9799db9ed1449fa2f2fc597d4b91612d.tar.gz | |
Merge pull request #11568 from endragor/loggers
Extract logging logic
Diffstat (limited to 'core/error_macros.cpp')
| -rw-r--r-- | core/error_macros.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/error_macros.cpp b/core/error_macros.cpp index 5919d38375..170a22e8dd 100644 --- a/core/error_macros.cpp +++ b/core/error_macros.cpp @@ -29,6 +29,7 @@ /*************************************************************************/ #include "error_macros.h" +#include "io/logger.h" #include "os/os.h" bool _err_error_exists = false; @@ -79,7 +80,7 @@ void remove_error_handler(ErrorHandlerList *p_handler) { void _err_print_error(const char *p_function, const char *p_file, int p_line, const char *p_error, ErrorHandlerType p_type) { - OS::get_singleton()->print_error(p_function, p_file, p_line, p_error, _err_error_exists ? OS::get_singleton()->get_last_error() : "", (OS::ErrorType)p_type); + OS::get_singleton()->print_error(p_function, p_file, p_line, p_error, _err_error_exists ? OS::get_singleton()->get_last_error() : "", (Logger::ErrorType)p_type); _global_lock(); ErrorHandlerList *l = error_handler_list; |