summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2023-02-15 10:16:49 +0100
committerGitHub <noreply@github.com>2023-02-15 10:16:49 +0100
commitf5133c08a529d027e3232d593b0f6c3ca45a0545 (patch)
treebfef966067383b7d1326b7cc43d5d5b145775b64
parent0068320ff13fd91d16f3a2bdcf7956cd439c2869 (diff)
parent07c914b479d6d99b5e86dfb5f9fa1a727963ba1d (diff)
downloadredot-cpp-f5133c08a529d027e3232d593b0f6c3ca45a0545.tar.gz
Merge pull request #1040 from zhehangd/fix_const_str_ptr
Fix compilation error: const GDExtensionStringPtr -> GDExtensionConst…
-rw-r--r--src/classes/low_level.cpp4
-rw-r--r--src/variant/char_string.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/classes/low_level.cpp b/src/classes/low_level.cpp
index b984187..681b2b4 100644
--- a/src/classes/low_level.cpp
+++ b/src/classes/low_level.cpp
@@ -48,11 +48,11 @@ void FileAccess::store_buffer(const uint8_t *p_src, uint64_t p_length) {
}
WorkerThreadPool::TaskID WorkerThreadPool::add_native_task(void (*p_func)(void *), void *p_userdata, bool p_high_priority, const String &p_description) {
- return (TaskID)internal::gde_interface->worker_thread_pool_add_native_task(_owner, p_func, p_userdata, p_high_priority, (const GDExtensionStringPtr)&p_description);
+ return (TaskID)internal::gde_interface->worker_thread_pool_add_native_task(_owner, p_func, p_userdata, p_high_priority, (GDExtensionConstStringPtr)&p_description);
}
WorkerThreadPool::GroupID WorkerThreadPool::add_native_group_task(void (*p_func)(void *, uint32_t), void *p_userdata, int p_elements, int p_tasks, bool p_high_priority, const String &p_description) {
- return (GroupID)internal::gde_interface->worker_thread_pool_add_native_group_task(_owner, p_func, p_userdata, p_elements, p_tasks, p_high_priority, (const GDExtensionStringPtr)&p_description);
+ return (GroupID)internal::gde_interface->worker_thread_pool_add_native_group_task(_owner, p_func, p_userdata, p_elements, p_tasks, p_high_priority, (GDExtensionConstStringPtr)&p_description);
}
} // namespace godot
diff --git a/src/variant/char_string.cpp b/src/variant/char_string.cpp
index a9c170e..bd0bc3f 100644
--- a/src/variant/char_string.cpp
+++ b/src/variant/char_string.cpp
@@ -353,7 +353,7 @@ String String::operator+(const char32_t p_char) {
}
String &String::operator+=(const String &p_str) {
- internal::gde_interface->string_operator_plus_eq_string((GDExtensionStringPtr)this, (const GDExtensionStringPtr)&p_str);
+ internal::gde_interface->string_operator_plus_eq_string((GDExtensionStringPtr)this, (GDExtensionConstStringPtr)&p_str);
return *this;
}