[DEV] update to the new ETK allocator wrapper

This commit is contained in:
Edouard DUPIN 2017-10-21 19:05:21 +02:00
parent f99cba3d54
commit 018dab1e2e
6 changed files with 10 additions and 10 deletions

View File

@ -9,7 +9,7 @@
#include <exml/internal/Document.hpp> #include <exml/internal/Document.hpp>
ememory::SharedPtr<exml::internal::Attribute> exml::internal::Attribute::create(const etk::String& _name, const etk::String& _value) { ememory::SharedPtr<exml::internal::Attribute> exml::internal::Attribute::create(const etk::String& _name, const etk::String& _value) {
return ememory::SharedPtr<exml::internal::Attribute>(new exml::internal::Attribute(_name, _value)); return ememory::SharedPtr<exml::internal::Attribute>(ETK_NEW(exml::internal::Attribute, _name, _value));
} }
exml::internal::Attribute::Attribute(const etk::String& _name, const etk::String& _value) : exml::internal::Attribute::Attribute(const etk::String& _name, const etk::String& _value) :

View File

@ -19,7 +19,7 @@ static bool isWhiteChar(char32_t _val) {
} }
ememory::SharedPtr<exml::internal::Comment> exml::internal::Comment::create(const etk::String& _value) { ememory::SharedPtr<exml::internal::Comment> exml::internal::Comment::create(const etk::String& _value) {
return ememory::SharedPtr<exml::internal::Comment>(new exml::internal::Comment(_value)); return ememory::SharedPtr<exml::internal::Comment>(ETK_NEW(exml::internal::Comment, _value));
} }
bool exml::internal::Comment::iParse(const etk::String& _data, int32_t& _pos, bool _caseSensitive, exml::FilePos& _filePos, exml::internal::Document& _doc) { bool exml::internal::Comment::iParse(const etk::String& _data, int32_t& _pos, bool _caseSensitive, exml::FilePos& _filePos, exml::internal::Document& _doc) {

View File

@ -16,11 +16,11 @@
*/ */
ememory::SharedPtr<exml::internal::Declaration> exml::internal::Declaration::create(const etk::String& _name) { ememory::SharedPtr<exml::internal::Declaration> exml::internal::Declaration::create(const etk::String& _name) {
return ememory::SharedPtr<exml::internal::Declaration>(new exml::internal::Declaration(_name)); return ememory::SharedPtr<exml::internal::Declaration>(ETK_NEW(exml::internal::Declaration, _name));
} }
ememory::SharedPtr<exml::internal::DeclarationXML> exml::internal::DeclarationXML::create(const etk::String& _version, const etk::String& _format, bool _standalone) { ememory::SharedPtr<exml::internal::DeclarationXML> exml::internal::DeclarationXML::create(const etk::String& _version, const etk::String& _format, bool _standalone) {
return ememory::SharedPtr<exml::internal::DeclarationXML>(new exml::internal::DeclarationXML(_version, _format, _standalone)); return ememory::SharedPtr<exml::internal::DeclarationXML>(ETK_NEW(exml::internal::DeclarationXML, _version, _format, _standalone));
} }
exml::internal::DeclarationXML::DeclarationXML(const etk::String& _version, const etk::String& _format, bool _standalone) : exml::internal::DeclarationXML::DeclarationXML(const etk::String& _version, const etk::String& _format, bool _standalone) :
@ -75,7 +75,7 @@ bool exml::internal::Declaration::iParse(const etk::String& _data, int32_t& _pos
return true; return true;
} }
if (checkAvaillable(_data[iii], true) == true) { if (checkAvaillable(_data[iii], true) == true) {
// we find an attibute == > create a new and parse it : // we find an attibute == > create an element and parse it:
ememory::SharedPtr<exml::internal::Attribute> attribute = exml::internal::Attribute::create(); ememory::SharedPtr<exml::internal::Attribute> attribute = exml::internal::Attribute::create();
if (attribute == nullptr) { if (attribute == nullptr) {
CREATE_ERROR(_doc, _data, _pos, _filePos, " Allocation error ..."); CREATE_ERROR(_doc, _data, _pos, _filePos, " Allocation error ...");

View File

@ -9,7 +9,7 @@
#include <etk/os/FSNode.hpp> #include <etk/os/FSNode.hpp>
ememory::SharedPtr<exml::internal::Document> exml::internal::Document::create() { ememory::SharedPtr<exml::internal::Document> exml::internal::Document::create() {
return ememory::SharedPtr<exml::internal::Document>(new exml::internal::Document()); return ememory::SharedPtr<exml::internal::Document>(ETK_NEW(exml::internal::Document));
} }
exml::internal::Document::Document() : exml::internal::Document::Document() :

View File

@ -23,7 +23,7 @@ static bool isWhiteChar(char32_t _val) {
} }
ememory::SharedPtr<exml::internal::Element> exml::internal::Element::create(const etk::String& _value) { ememory::SharedPtr<exml::internal::Element> exml::internal::Element::create(const etk::String& _value) {
return ememory::SharedPtr<exml::internal::Element>(new exml::internal::Element(_value)); return ememory::SharedPtr<exml::internal::Element>(ETK_NEW(exml::internal::Element, _value));
} }
enum exml::nodeType exml::internal::Element::getType(int32_t _id) const { enum exml::nodeType exml::internal::Element::getType(int32_t _id) const {
@ -474,7 +474,7 @@ bool exml::internal::Element::iParse(const etk::String& _data,
return false; return false;
} }
if (checkAvaillable(_data[iii], true) == true) { if (checkAvaillable(_data[iii], true) == true) {
// we find an attibute == > create a new and parse it : // we find an attibute == > create an element and parse it:
ememory::SharedPtr<exml::internal::Attribute> attribute = exml::internal::Attribute::create(); ememory::SharedPtr<exml::internal::Attribute> attribute = exml::internal::Attribute::create();
if (attribute == nullptr) { if (attribute == nullptr) {
CREATE_ERROR(_doc, _data, _pos, _filePos, "Allocation error ..."); CREATE_ERROR(_doc, _data, _pos, _filePos, "Allocation error ...");

View File

@ -46,7 +46,7 @@ static bool isWhiteChar(char32_t _val) {
} }
ememory::SharedPtr<exml::internal::Text> exml::internal::Text::create(const etk::String& _data) { ememory::SharedPtr<exml::internal::Text> exml::internal::Text::create(const etk::String& _data) {
return ememory::SharedPtr<exml::internal::Text>(new exml::internal::Text(_data)); return ememory::SharedPtr<exml::internal::Text>(ETK_NEW(exml::internal::Text, _data));
} }
bool exml::internal::Text::iGenerate(etk::String& _data, int32_t _indent) const { bool exml::internal::Text::iGenerate(etk::String& _data, int32_t _indent) const {
@ -105,7 +105,7 @@ bool exml::internal::Text::iParse(const etk::String& _data,
ememory::SharedPtr<exml::internal::TextCDATA> exml::internal::TextCDATA::create() { ememory::SharedPtr<exml::internal::TextCDATA> exml::internal::TextCDATA::create() {
return ememory::SharedPtr<exml::internal::TextCDATA>(new exml::internal::TextCDATA()); return ememory::SharedPtr<exml::internal::TextCDATA>(ETK_NEW(exml::internal::TextCDATA));
} }
bool exml::internal::TextCDATA::iGenerate(etk::String& _data, int32_t _indent) const { bool exml::internal::TextCDATA::iGenerate(etk::String& _data, int32_t _indent) const {