From 018dab1e2e70ca38c3314f1cd843719dce30f1c5 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Sat, 21 Oct 2017 19:05:21 +0200 Subject: [PATCH] [DEV] update to the new ETK allocator wrapper --- exml/internal/Attribute.cpp | 2 +- exml/internal/Comment.cpp | 2 +- exml/internal/Declaration.cpp | 6 +++--- exml/internal/Document.cpp | 2 +- exml/internal/Element.cpp | 4 ++-- exml/internal/Text.cpp | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/exml/internal/Attribute.cpp b/exml/internal/Attribute.cpp index 0cf7450..3689a81 100644 --- a/exml/internal/Attribute.cpp +++ b/exml/internal/Attribute.cpp @@ -9,7 +9,7 @@ #include ememory::SharedPtr exml::internal::Attribute::create(const etk::String& _name, const etk::String& _value) { - return ememory::SharedPtr(new exml::internal::Attribute(_name, _value)); + return ememory::SharedPtr(ETK_NEW(exml::internal::Attribute, _name, _value)); } exml::internal::Attribute::Attribute(const etk::String& _name, const etk::String& _value) : diff --git a/exml/internal/Comment.cpp b/exml/internal/Comment.cpp index 152a334..4d22d6b 100644 --- a/exml/internal/Comment.cpp +++ b/exml/internal/Comment.cpp @@ -19,7 +19,7 @@ static bool isWhiteChar(char32_t _val) { } ememory::SharedPtr exml::internal::Comment::create(const etk::String& _value) { - return ememory::SharedPtr(new exml::internal::Comment(_value)); + return ememory::SharedPtr(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) { diff --git a/exml/internal/Declaration.cpp b/exml/internal/Declaration.cpp index b44ac6f..8c3deb5 100644 --- a/exml/internal/Declaration.cpp +++ b/exml/internal/Declaration.cpp @@ -16,11 +16,11 @@ */ ememory::SharedPtr exml::internal::Declaration::create(const etk::String& _name) { - return ememory::SharedPtr(new exml::internal::Declaration(_name)); + return ememory::SharedPtr(ETK_NEW(exml::internal::Declaration, _name)); } ememory::SharedPtr exml::internal::DeclarationXML::create(const etk::String& _version, const etk::String& _format, bool _standalone) { - return ememory::SharedPtr(new exml::internal::DeclarationXML(_version, _format, _standalone)); + return ememory::SharedPtr(ETK_NEW(exml::internal::DeclarationXML, _version, _format, _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; } 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 attribute = exml::internal::Attribute::create(); if (attribute == nullptr) { CREATE_ERROR(_doc, _data, _pos, _filePos, " Allocation error ..."); diff --git a/exml/internal/Document.cpp b/exml/internal/Document.cpp index 93b0665..2ed1ac3 100644 --- a/exml/internal/Document.cpp +++ b/exml/internal/Document.cpp @@ -9,7 +9,7 @@ #include ememory::SharedPtr exml::internal::Document::create() { - return ememory::SharedPtr(new exml::internal::Document()); + return ememory::SharedPtr(ETK_NEW(exml::internal::Document)); } exml::internal::Document::Document() : diff --git a/exml/internal/Element.cpp b/exml/internal/Element.cpp index cb28ca6..8bb6b65 100644 --- a/exml/internal/Element.cpp +++ b/exml/internal/Element.cpp @@ -23,7 +23,7 @@ static bool isWhiteChar(char32_t _val) { } ememory::SharedPtr exml::internal::Element::create(const etk::String& _value) { - return ememory::SharedPtr(new exml::internal::Element(_value)); + return ememory::SharedPtr(ETK_NEW(exml::internal::Element, _value)); } 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; } 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 attribute = exml::internal::Attribute::create(); if (attribute == nullptr) { CREATE_ERROR(_doc, _data, _pos, _filePos, "Allocation error ..."); diff --git a/exml/internal/Text.cpp b/exml/internal/Text.cpp index ccf4218..672b56e 100644 --- a/exml/internal/Text.cpp +++ b/exml/internal/Text.cpp @@ -46,7 +46,7 @@ static bool isWhiteChar(char32_t _val) { } ememory::SharedPtr exml::internal::Text::create(const etk::String& _data) { - return ememory::SharedPtr(new exml::internal::Text(_data)); + return ememory::SharedPtr(ETK_NEW(exml::internal::Text, _data)); } 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::create() { - return ememory::SharedPtr(new exml::internal::TextCDATA()); + return ememory::SharedPtr(ETK_NEW(exml::internal::TextCDATA)); } bool exml::internal::TextCDATA::iGenerate(etk::String& _data, int32_t _indent) const {