[DEBUG] continue removing STL

This commit is contained in:
Edouard DUPIN 2017-09-17 15:23:44 +02:00
parent b91410fef3
commit 9f5b164097

View File

@ -219,7 +219,7 @@ bool ejson::internal::Object::iGenerate(etk::String& _data, size_t _indent) cons
} else if (_indent<=1) { } else if (_indent<=1) {
oneLine = false; oneLine = false;
} else { } else {
for (int32_t iii=0; iii<m_value.size() ; iii++) { for (size_t iii=0; iii<m_value.size() ; iii++) {
const ememory::SharedPtr<ejson::internal::Value> tmp = m_value.getValue(iii); const ememory::SharedPtr<ejson::internal::Value> tmp = m_value.getValue(iii);
if (tmp == nullptr) { if (tmp == nullptr) {
continue; continue;
@ -248,7 +248,7 @@ bool ejson::internal::Object::iGenerate(etk::String& _data, size_t _indent) cons
} else { } else {
_data += "{\n"; _data += "{\n";
} }
for (int32_t iii=0; iii<m_value.size(); ++iii) { for (size_t iii=0; iii<m_value.size(); ++iii) {
if (oneLine == false) { if (oneLine == false) {
addIndent(_data, _indent); addIndent(_data, _indent);
} }
@ -275,7 +275,7 @@ bool ejson::internal::Object::iGenerate(etk::String& _data, size_t _indent) cons
void ejson::internal::Object::iMachineGenerate(etk::String& _data) const { void ejson::internal::Object::iMachineGenerate(etk::String& _data) const {
_data += "{"; _data += "{";
bool needComa = false; bool needComa = false;
for (int32_t iii=0; iii<m_value.size(); ++iii) { for (size_t iii=0; iii<m_value.size(); ++iii) {
if (needComa == true) { if (needComa == true) {
_data += ","; _data += ",";
} }
@ -374,7 +374,7 @@ bool ejson::internal::Object::cloneIn(ememory::SharedPtr<ejson::internal::Object
return false; return false;
} }
_obj->clear(); _obj->clear();
for (int32_t iii=0; iii<m_value.size(); ++iii) { for (size_t iii=0; iii<m_value.size(); ++iii) {
_obj->add(m_value.getKey(iii), m_value[iii]->clone()); _obj->add(m_value.getKey(iii), m_value[iii]->clone());
} }
return true; return true;
@ -392,7 +392,7 @@ ememory::SharedPtr<ejson::internal::Object> ejson::internal::Object::cloneObj()
EJSON_ERROR("Allocation error ..."); EJSON_ERROR("Allocation error ...");
return ememory::SharedPtr<ejson::internal::Object>(); return ememory::SharedPtr<ejson::internal::Object>();
} }
for (int32_t iii=0; iii<m_value.size(); ++iii) { for (size_t iii=0; iii<m_value.size(); ++iii) {
ememory::SharedPtr<ejson::internal::Value> val = m_value.getValue(iii); ememory::SharedPtr<ejson::internal::Value> val = m_value.getValue(iii);
etk::String key = m_value.getKey(iii); etk::String key = m_value.getKey(iii);
if (val == nullptr) { if (val == nullptr) {