Sara.Sync
/
godot-cpp
mirror of https://github.com/godotengine/godot-cpp
0
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #339 from Faless/fix/macro_namespace 

Add godot namespace to references in Defs macros.
pull/362/head
Rémi Verschelde 2019-12-17 11:58:22 +01:00 committed by GitHub
parent 3ee07f652b 91e9262210
commit 7cbb846417
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/core/Defs.hpp
View File

@ -91,7 +91,7 @@ typedef float real_t;
// ERR/WARN macros // ERR/WARN macros
#ifndef WARN_PRINT #ifndef WARN_PRINT
#define WARN_PRINT(msg) Godot::print_warning(msg, __func__, __FILE__, __LINE__) #define WARN_PRINT(msg) godot::Godot::print_warning(msg, __func__, __FILE__, __LINE__)
#endif #endif
#ifndef WARN_PRINTS #ifndef WARN_PRINTS
@ -99,7 +99,7 @@ typedef float real_t;
#endif #endif
#ifndef ERR_PRINT #ifndef ERR_PRINT
#define ERR_PRINT(msg) Godot::print_error(msg, __func__, __FILE__, __LINE__) #define ERR_PRINT(msg) godot::Godot::print_error(msg, __func__, __FILE__, __LINE__)
#endif #endif
#ifndef ERR_PRINTS #ifndef ERR_PRINTS
@ -107,19 +107,19 @@ typedef float real_t;
#endif #endif
#ifndef FATAL_PRINT #ifndef FATAL_PRINT
#define FATAL_PRINT(msg) ERR_PRINT(String("FATAL: ") + (msg)) #define FATAL_PRINT(msg) ERR_PRINT(godot::String("FATAL: ") + (msg))
#endif #endif
#ifndef ERR_MSG_INDEX #ifndef ERR_MSG_INDEX
#define ERR_MSG_INDEX(index, size) (String("Index ") + #index + "=" + String::num_int64(index) + " out of size (" + #size + "=" + String::num_int64(size) + ")") #define ERR_MSG_INDEX(index, size) (godot::String("Index ") + #index + "=" + godot::String::num_int64(index) + " out of size (" + #size + "=" + godot::String::num_int64(size) + ")")
#endif #endif
#ifndef ERR_MSG_NULL #ifndef ERR_MSG_NULL
#define ERR_MSG_NULL(param) (String("Parameter '") + #param + "' is null.") #define ERR_MSG_NULL(param) (godot::String("Parameter '") + #param + "' is null.")
#endif #endif
#ifndef ERR_MSG_COND #ifndef ERR_MSG_COND
#define ERR_MSG_COND(cond) (String("Condition '") + #cond + "' is true.") #define ERR_MSG_COND(cond) (godot::String("Condition '") + #cond + "' is true.")
#endif #endif
#ifndef ERR_FAIL_INDEX #ifndef ERR_FAIL_INDEX