Browse Source

removed _deleted class member

DhruvMaroo 4 years ago
parent
commit
b44b98a94c
2 changed files with 1 additions and 7 deletions
  1. 0 1
      include/core/String.hpp
  2. 1 6
      src/core/String.cpp

+ 0 - 1
include/core/String.hpp

@@ -17,7 +17,6 @@ class CharString {
 	friend class String;
 
 	godot_char_string _char_string;
-	bool _deleted = false;
 
 public:
 	~CharString();

+ 1 - 6
src/core/String.cpp

@@ -75,14 +75,10 @@ String::String(const String &other) {
 
 String::String(String&& other) {
 	_godot_string = other._godot_string;
-	other._deleted = true;
 }
 
 String::~String() {
-	if (!_deleted) {
-		godot::api->godot_string_destroy(&_godot_string);
-		_deleted = true;
-	}
+	godot::api->godot_string_destroy(&_godot_string);
 }
 
 wchar_t &String::operator[](const int idx) {
@@ -105,7 +101,6 @@ void String::operator=(const String &s) {
 void String::operator=(String&& s) {
 	godot::api->godot_string_destroy(&_godot_string);
 	_godot_string = s._godot_string;
-	s._deleted = true;
 }
 
 bool String::operator==(const String &s) const {