godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix debug build for iphone 

printf() does not have a version that accepts std::string
as format string parameter.

(cherry picked from commit a1a3e79ea5)
This commit is contained in:
Gergely Kis 2021-11-22 18:05:24 +01:00 committed by Rémi Verschelde
parent b8bda1fb67
commit f2ef3e67a1
No known key found for this signature in database
GPG Key ID: C3336907360768E1
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
thirdparty/embree/common/sys/platform.h vendored
View File

@ -183,7 +183,7 @@
// #define THROW_RUNTIME_ERROR(str) // #define THROW_RUNTIME_ERROR(str)
// throw std::runtime_error(std::string(__FILE__) + " (" + toString(__LINE__) + "): " + std::string(str)); // throw std::runtime_error(std::string(__FILE__) + " (" + toString(__LINE__) + "): " + std::string(str));
#define THROW_RUNTIME_ERROR(str) \ #define THROW_RUNTIME_ERROR(str) \
printf(std::string(__FILE__) + " (" + toString(__LINE__) + "): " + std::string(str)), abort(); printf("%s (%d): %s", __FILE__, __LINE__, std::string(str).c_str()), abort();
// -- GODOT end -- // -- GODOT end --
#else #else
// -- GODOT start -- // -- GODOT start --

2
thirdparty/embree/kernels/common/rtcore.h vendored
View File

@ -126,7 +126,7 @@ namespace embree
// #define throw_RTCError(error,str) \ // #define throw_RTCError(error,str) \
// throw rtcore_error(error,std::string(__FILE__) + " (" + toString(__LINE__) + "): " + std::string(str)); // throw rtcore_error(error,std::string(__FILE__) + " (" + toString(__LINE__) + "): " + std::string(str));
#define throw_RTCError(error,str) \ #define throw_RTCError(error,str) \
printf(std::string(__FILE__) + " (" + toString(__LINE__) + "): " + std::string(str)), abort(); printf("%s (%d): %s", __FILE__, __LINE__, std::string(str).c_str()), abort();
// -- GODOT end -- // -- GODOT end --
#else #else
// -- GODOT begin -- // -- GODOT begin --

4
thirdparty/embree/patches/godot-changes-noexcept.patch vendored
View File

@ -259,7 +259,7 @@ index 8a6d9fa0a9..697e07bb86 100644
+ // throw std::runtime_error(std::string(__FILE__) + " (" + toString(__LINE__) + "): " + std::string(str)); + // throw std::runtime_error(std::string(__FILE__) + " (" + toString(__LINE__) + "): " + std::string(str));
#define THROW_RUNTIME_ERROR(str) \ #define THROW_RUNTIME_ERROR(str) \
- throw std::runtime_error(std::string(__FILE__) + " (" + toString(__LINE__) + "): " + std::string(str)); - throw std::runtime_error(std::string(__FILE__) + " (" + toString(__LINE__) + "): " + std::string(str));
+ printf(std::string(__FILE__) + " (" + toString(__LINE__) + "): " + std::string(str)), abort(); + printf("%s (%d): %s", __FILE__, __LINE__, std::string(str).c_str()), abort();
+ // -- GODOT end -- + // -- GODOT end --
#else #else
+ // -- GODOT start -- + // -- GODOT start --
@ -583,7 +583,7 @@ index 4e4b24e9c2..373e49a689 100644
+ // throw rtcore_error(error,std::string(__FILE__) + " (" + toString(__LINE__) + "): " + std::string(str)); + // throw rtcore_error(error,std::string(__FILE__) + " (" + toString(__LINE__) + "): " + std::string(str));
#define throw_RTCError(error,str) \ #define throw_RTCError(error,str) \
- throw rtcore_error(error,std::string(__FILE__) + " (" + toString(__LINE__) + "): " + std::string(str)); - throw rtcore_error(error,std::string(__FILE__) + " (" + toString(__LINE__) + "): " + std::string(str));
+ printf(std::string(__FILE__) + " (" + toString(__LINE__) + "): " + std::string(str)), abort(); + printf("%s (%d): %s", __FILE__, __LINE__, std::string(str).c_str()), abort();
+ // -- GODOT end -- + // -- GODOT end --
#else #else
+ // -- GODOT begin -- + // -- GODOT begin --