Skip to content

String operator_plus fix #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 22, 2017
Merged

String operator_plus fix #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions include/core/Godot.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,14 @@ class GodotScript {
#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:

#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) {} \
Copy link
Contributor

@karroffel karroffel Jul 22, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is that here?

Copy link
Contributor Author

@RameshRavone RameshRavone Jul 22, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It fixed the class Inheritance

private:


Expand Down
4 changes: 2 additions & 2 deletions src/core/String.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down