From b549dfe474648cb399db24e3ffaf58edbcf469ec Mon Sep 17 00:00:00 2001 From: Joshua Granick Date: Mon, 19 Dec 2016 19:56:10 -0800 Subject: [PATCH] Remove _root from native Bytes --- project/include/utils/Bytes.h | 1 - project/src/utils/Bytes.cpp | 39 +---------------------------------- 2 files changed, 1 insertion(+), 39 deletions(-) diff --git a/project/include/utils/Bytes.h b/project/include/utils/Bytes.h index 57017ca15..6b66cc2ad 100644 --- a/project/include/utils/Bytes.h +++ b/project/include/utils/Bytes.h @@ -30,7 +30,6 @@ namespace lime { unsigned char *_data; int _length; - AutoGCRoot *_root; value _value; diff --git a/project/src/utils/Bytes.cpp b/project/src/utils/Bytes.cpp index 4b9e1f2d0..b52a6d136 100644 --- a/project/src/utils/Bytes.cpp +++ b/project/src/utils/Bytes.cpp @@ -39,7 +39,6 @@ namespace lime { _data = 0; _length = 0; - _root = 0; _value = 0; } @@ -51,7 +50,6 @@ namespace lime { _data = 0; _length = 0; - _root = 0; _value = 0; Resize (size); @@ -65,7 +63,6 @@ namespace lime { _data = 0; _length = 0; - _root = 0; _value = 0; Set (bytes); @@ -79,7 +76,6 @@ namespace lime { _data = 0; _length = 0; - _root = 0; _value = 0; ReadFile (path); @@ -93,7 +89,6 @@ namespace lime { _data = 0; _length = 0; - _root = 0; _value = 0; Set (data); @@ -103,11 +98,7 @@ namespace lime { Bytes::~Bytes () { - if (_root) { - - delete _root; - - } + } @@ -166,7 +157,6 @@ namespace lime { if (!_value) { _value = alloc_empty_object (); - _root = new AutoGCRoot (_value); } @@ -225,28 +215,9 @@ namespace lime { _data = 0; _value = 0; - if (_root) { - - delete _root; - - } - - _root = 0; - } else { _value = bytes; - - if (!_root) { - - _root = new AutoGCRoot (_value); - - } else { - - _root->set (_value); - - } - _length = val_int (val_field (bytes, id_length)); if (_length > 0) { @@ -288,14 +259,6 @@ namespace lime { _data = 0; _length = 0; - if (_root) { - - delete _root; - - } - - _root = 0; - } }