diff options
| author | Ramesh Ravone <ramesh.maran443@gmail.com> | 2017-07-22 19:11:38 +0530 |
|---|---|---|
| committer | Ramesh Ravone <ramesh.maran443@gmail.com> | 2017-07-22 19:16:10 +0530 |
| commit | 36561b58531d25e43659e34fe5370cb170c806f3 (patch) | |
| tree | 488b3886e4f18f3fed885c0694906339e1b1e17b | |
| parent | a3bcda958ea503ede07be35b46a6d983173d4b1c (diff) | |
| download | redot-cpp-36561b58531d25e43659e34fe5370cb170c806f3.tar.gz | |
String operator_plus fix
| -rw-r--r-- | include/core/Godot.hpp | 3 | ||||
| -rw-r--r-- | src/core/String.cpp | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/core/Godot.hpp b/include/core/Godot.hpp index ba86a5c..320a4f1 100644 --- a/include/core/Godot.hpp +++ b/include/core/Godot.hpp @@ -50,7 +50,6 @@ public: #define GODOT_NATIVE_TERMINATE(arg) extern "C" void GD_EXPORT godot_native_terminate(arg) - #define GODOT_CLASS(Name) \ public: inline static char *___get_type_name() { return (char *) #Name; } \ private: @@ -58,7 +57,7 @@ public: #define GODOT_SUBCLASS(Name, Base) \ public: inline static char *___get_type_name() { return (char *) #Name; } \ inline static char *___get_base_type_name() { return (char *) #Base; } \ - inline Name(godot_object *o) : Base(o) {} \ + //inline Name(godot_object *o) : Base(o) {} \ private: diff --git a/src/core/String.cpp b/src/core/String.cpp index 6d0dc56..84c8ee8 100644 --- a/src/core/String.cpp +++ b/src/core/String.cpp @@ -84,14 +84,14 @@ bool String::operator !=(const String &s) String String::operator +(const String &s) { String new_string = *this; - godot_string_operator_plus(&new_string._godot_string, &s._godot_string); + new_string._godot_string = godot_string_operator_plus(&new_string._godot_string, &s._godot_string); return new_string; } void String::operator +=(const String &s) { - godot_string_operator_plus(&_godot_string, &s._godot_string); + _godot_string = godot_string_operator_plus(&_godot_string, &s._godot_string); } void String::operator +=(const wchar_t c) |
