Merge pull request #69 from Zylann/fix_copy_constructors

Added copy constructors and assignment operators to Array and Dictionary
pull/71/head
Thomas Herzog 2018-01-17 08:42:09 +01:00 committed by GitHub
commit b9b06b5fbc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 0 deletions

View File

@ -22,6 +22,8 @@ class Array {
godot_array _godot_array;
public:
Array();
Array(const Array & other);
Array & operator=(const Array & other);
Array(const PoolByteArray& a);

View File

@ -13,6 +13,8 @@ class Dictionary {
godot_dictionary _godot_dictionary;
public:
Dictionary();
Dictionary(const Dictionary & other);
Dictionary & operator=(const Dictionary & other);
void clear();

View File

@ -13,6 +13,18 @@ Array::Array()
godot::api->godot_array_new(&_godot_array);
}
Array::Array(const Array & other)
{
godot::api->godot_array_new_copy(&_godot_array, &other._godot_array);
}
Array & Array::operator=(const Array & other)
{
godot::api->godot_array_destroy(&_godot_array);
godot::api->godot_array_new_copy(&_godot_array, &other._godot_array);
return *this;
}
Array::Array(const PoolByteArray& a)
{
godot::api->godot_array_new_pool_byte_array(&_godot_array, (godot_pool_byte_array *) &a);

View File

@ -10,6 +10,18 @@ Dictionary::Dictionary()
godot::api->godot_dictionary_new(&_godot_dictionary);
}
Dictionary::Dictionary(const Dictionary & other)
{
godot::api->godot_dictionary_new_copy(&_godot_dictionary, &other._godot_dictionary);
}
Dictionary & Dictionary::operator=(const Dictionary & other)
{
godot::api->godot_dictionary_destroy(&_godot_dictionary);
godot::api->godot_dictionary_new_copy(&_godot_dictionary, &other._godot_dictionary);
return *this;
}
void Dictionary::clear()
{
godot::api->godot_dictionary_clear(&_godot_dictionary);