From c41bcd52d4e6ba875d860a062b1d9620b8a7897d Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Thu, 28 Apr 2016 23:38:54 +0200 Subject: [PATCH] [DEBUG] correct the type of the Object --- ejson/Array.cpp | 4 +--- ejson/Array.h | 4 +--- ejson/Boolean.cpp | 4 +--- ejson/Boolean.h | 4 +--- ejson/Document.cpp | 4 +--- ejson/Document.h | 4 +--- ejson/FilePos.cpp | 4 +--- ejson/FilePos.h | 4 +--- ejson/Null.cpp | 4 +--- ejson/Null.h | 4 +--- ejson/Number.cpp | 4 +--- ejson/Number.h | 4 +--- ejson/Object.cpp | 7 +++---- ejson/Object.h | 4 +--- ejson/String.cpp | 4 +--- ejson/String.h | 4 +--- ejson/Value.cpp | 4 +--- ejson/Value.h | 4 +--- ejson/debug.cpp | 4 +--- ejson/debug.h | 4 +--- ejson/details/iterator.hxx | 2 -- ejson/ejson.h | 4 +--- ejson/internal/Array.cpp | 4 +--- ejson/internal/Array.h | 4 +--- ejson/internal/Boolean.cpp | 4 +--- ejson/internal/Boolean.h | 4 +--- ejson/internal/Document.cpp | 4 +--- ejson/internal/Document.h | 4 +--- ejson/internal/Null.cpp | 4 +--- ejson/internal/Null.h | 4 +--- ejson/internal/Number.cpp | 4 +--- ejson/internal/Number.h | 4 +--- ejson/internal/Object.cpp | 4 +--- ejson/internal/Object.h | 4 +--- ejson/internal/String.cpp | 4 +--- ejson/internal/String.h | 4 +--- ejson/internal/Value.cpp | 4 +--- ejson/internal/Value.h | 4 +--- ejson/iterator.h | 2 -- ejson/valueType.cpp | 2 -- ejson/valueType.h | 2 -- 41 files changed, 39 insertions(+), 120 deletions(-) diff --git a/ejson/Array.cpp b/ejson/Array.cpp index 5023c58..5f5c5dd 100644 --- a/ejson/Array.cpp +++ b/ejson/Array.cpp @@ -1,8 +1,6 @@ -/** +/** @file * @author Edouard DUPIN - * * @copyright 2011, Edouard DUPIN, all right reserved - * * @license APACHE v2.0 (see license file) */ #include diff --git a/ejson/Array.h b/ejson/Array.h index f0130fa..dcb87d0 100644 --- a/ejson/Array.h +++ b/ejson/Array.h @@ -1,8 +1,6 @@ -/** +/** @file * @author Edouard DUPIN - * * @copyright 2011, Edouard DUPIN, all right reserved - * * @license APACHE v2.0 (see license file) */ #pragma once diff --git a/ejson/Boolean.cpp b/ejson/Boolean.cpp index fb55780..799fac3 100644 --- a/ejson/Boolean.cpp +++ b/ejson/Boolean.cpp @@ -1,8 +1,6 @@ -/** +/** @file * @author Edouard DUPIN - * * @copyright 2011, Edouard DUPIN, all right reserved - * * @license APACHE v2.0 (see license file) */ diff --git a/ejson/Boolean.h b/ejson/Boolean.h index f45ac89..741dde3 100644 --- a/ejson/Boolean.h +++ b/ejson/Boolean.h @@ -1,8 +1,6 @@ -/** +/** @file * @author Edouard DUPIN - * * @copyright 2011, Edouard DUPIN, all right reserved - * * @license APACHE v2.0 (see license file) */ #pragma once diff --git a/ejson/Document.cpp b/ejson/Document.cpp index 637029f..52e8bb1 100644 --- a/ejson/Document.cpp +++ b/ejson/Document.cpp @@ -1,8 +1,6 @@ -/** +/** @file * @author Edouard DUPIN - * * @copyright 2011, Edouard DUPIN, all right reserved - * * @license APACHE v2.0 (see license file) */ #include diff --git a/ejson/Document.h b/ejson/Document.h index 05e97d4..4dae191 100644 --- a/ejson/Document.h +++ b/ejson/Document.h @@ -1,8 +1,6 @@ -/** +/** @file * @author Edouard DUPIN - * * @copyright 2011, Edouard DUPIN, all right reserved - * * @license APACHE v2.0 (see license file) */ #pragma once diff --git a/ejson/FilePos.cpp b/ejson/FilePos.cpp index 0165ca9..1d3ce00 100644 --- a/ejson/FilePos.cpp +++ b/ejson/FilePos.cpp @@ -1,8 +1,6 @@ -/** +/** @file * @author Edouard DUPIN - * * @copyright 2011, Edouard DUPIN, all right reserved - * * @license APACHE v2.0 (see license file) */ diff --git a/ejson/FilePos.h b/ejson/FilePos.h index 4393209..6b6c65e 100644 --- a/ejson/FilePos.h +++ b/ejson/FilePos.h @@ -1,8 +1,6 @@ -/** +/** @file * @author Edouard DUPIN - * * @copyright 2011, Edouard DUPIN, all right reserved - * * @license APACHE v2.0 (see license file) */ #pragma once diff --git a/ejson/Null.cpp b/ejson/Null.cpp index b4384e2..95ed1f1 100644 --- a/ejson/Null.cpp +++ b/ejson/Null.cpp @@ -1,8 +1,6 @@ -/** +/** @file * @author Edouard DUPIN - * * @copyright 2011, Edouard DUPIN, all right reserved - * * @license APACHE v2.0 (see license file) */ #include diff --git a/ejson/Null.h b/ejson/Null.h index 12fdf7c..ffc5d11 100644 --- a/ejson/Null.h +++ b/ejson/Null.h @@ -1,8 +1,6 @@ -/** +/** @file * @author Edouard DUPIN - * * @copyright 2011, Edouard DUPIN, all right reserved - * * @license APACHE v2.0 (see license file) */ #pragma once diff --git a/ejson/Number.cpp b/ejson/Number.cpp index 0adcdfa..aef53ca 100644 --- a/ejson/Number.cpp +++ b/ejson/Number.cpp @@ -1,8 +1,6 @@ -/** +/** @file * @author Edouard DUPIN - * * @copyright 2011, Edouard DUPIN, all right reserved - * * @license APACHE v2.0 (see license file) */ #include diff --git a/ejson/Number.h b/ejson/Number.h index a347739..2deef21 100644 --- a/ejson/Number.h +++ b/ejson/Number.h @@ -1,8 +1,6 @@ -/** +/** @file * @author Edouard DUPIN - * * @copyright 2011, Edouard DUPIN, all right reserved - * * @license APACHE v2.0 (see license file) */ #pragma once diff --git a/ejson/Object.cpp b/ejson/Object.cpp index 3b5aa78..e7f464a 100644 --- a/ejson/Object.cpp +++ b/ejson/Object.cpp @@ -1,8 +1,6 @@ -/** +/** @file * @author Edouard DUPIN - * * @copyright 2011, Edouard DUPIN, all right reserved - * * @license APACHE v2.0 (see license file) */ #include @@ -15,7 +13,8 @@ ejson::Object::Object(ememory::SharedPtr _internalValue) if (m_data == nullptr) { return; } - if (m_data->getType() != ejson::valueType::null) { + if ( m_data->getType() != ejson::valueType::object + && m_data->getType() != ejson::valueType::document) { // try to set wrong type inside ... ==> remove it ... m_data = nullptr; } diff --git a/ejson/Object.h b/ejson/Object.h index 77ccf39..8839654 100644 --- a/ejson/Object.h +++ b/ejson/Object.h @@ -1,8 +1,6 @@ -/** +/** @file * @author Edouard DUPIN - * * @copyright 2011, Edouard DUPIN, all right reserved - * * @license APACHE v2.0 (see license file) */ #pragma once diff --git a/ejson/String.cpp b/ejson/String.cpp index 5a6ec9c..18362d1 100644 --- a/ejson/String.cpp +++ b/ejson/String.cpp @@ -1,8 +1,6 @@ -/** +/** @file * @author Edouard DUPIN - * * @copyright 2011, Edouard DUPIN, all right reserved - * * @license APACHE v2.0 (see license file) */ #include diff --git a/ejson/String.h b/ejson/String.h index 2774685..c94b98a 100644 --- a/ejson/String.h +++ b/ejson/String.h @@ -1,8 +1,6 @@ -/** +/** @file * @author Edouard DUPIN - * * @copyright 2011, Edouard DUPIN, all right reserved - * * @license APACHE v2.0 (see license file) */ #pragma once diff --git a/ejson/Value.cpp b/ejson/Value.cpp index 613d304..6b9e6fc 100644 --- a/ejson/Value.cpp +++ b/ejson/Value.cpp @@ -1,8 +1,6 @@ -/** +/** @file * @author Edouard DUPIN - * * @copyright 2011, Edouard DUPIN, all right reserved - * * @license APACHE v2.0 (see license file) */ diff --git a/ejson/Value.h b/ejson/Value.h index 40df2a4..2e68fe0 100644 --- a/ejson/Value.h +++ b/ejson/Value.h @@ -1,8 +1,6 @@ -/** +/** @file * @author Edouard DUPIN - * * @copyright 2011, Edouard DUPIN, all right reserved - * * @license APACHE v2.0 (see license file) */ #pragma once diff --git a/ejson/debug.cpp b/ejson/debug.cpp index 7558b92..a76f987 100644 --- a/ejson/debug.cpp +++ b/ejson/debug.cpp @@ -1,8 +1,6 @@ -/** +/** @file * @author Edouard DUPIN - * * @copyright 2011, Edouard DUPIN, all right reserved - * * @license APACHE v2.0 (see license file) */ diff --git a/ejson/debug.h b/ejson/debug.h index fc5e6dc..0144e21 100644 --- a/ejson/debug.h +++ b/ejson/debug.h @@ -1,8 +1,6 @@ -/** +/** @file * @author Edouard DUPIN - * * @copyright 2011, Edouard DUPIN, all right reserved - * * @license APACHE v2.0 (see license file) */ #pragma once diff --git a/ejson/details/iterator.hxx b/ejson/details/iterator.hxx index 8788115..0843ffa 100644 --- a/ejson/details/iterator.hxx +++ b/ejson/details/iterator.hxx @@ -1,8 +1,6 @@ /** @file * @author Edouard DUPIN - * * @copyright 2011, Edouard DUPIN, all right reserved - * * @license APACHE v2.0 (see license file) */ #include diff --git a/ejson/ejson.h b/ejson/ejson.h index 4190aab..1c45951 100644 --- a/ejson/ejson.h +++ b/ejson/ejson.h @@ -1,8 +1,6 @@ -/** +/** @file * @author Edouard DUPIN - * * @copyright 2011, Edouard DUPIN, all right reserved - * * @license APACHE v2.0 (see license file) */ #pragma once diff --git a/ejson/internal/Array.cpp b/ejson/internal/Array.cpp index 2f3f36f..8a1c71d 100644 --- a/ejson/internal/Array.cpp +++ b/ejson/internal/Array.cpp @@ -1,8 +1,6 @@ -/** +/** @file * @author Edouard DUPIN - * * @copyright 2011, Edouard DUPIN, all right reserved - * * @license APACHE v2.0 (see license file) */ diff --git a/ejson/internal/Array.h b/ejson/internal/Array.h index 14c8ae8..8f1d6ca 100644 --- a/ejson/internal/Array.h +++ b/ejson/internal/Array.h @@ -1,8 +1,6 @@ -/** +/** @file * @author Edouard DUPIN - * * @copyright 2011, Edouard DUPIN, all right reserved - * * @license APACHE v2.0 (see license file) */ #pragma once diff --git a/ejson/internal/Boolean.cpp b/ejson/internal/Boolean.cpp index 32cc491..7638bb7 100644 --- a/ejson/internal/Boolean.cpp +++ b/ejson/internal/Boolean.cpp @@ -1,8 +1,6 @@ -/** +/** @file * @author Edouard DUPIN - * * @copyright 2011, Edouard DUPIN, all right reserved - * * @license APACHE v2.0 (see license file) */ diff --git a/ejson/internal/Boolean.h b/ejson/internal/Boolean.h index a6f8d33..4171de0 100644 --- a/ejson/internal/Boolean.h +++ b/ejson/internal/Boolean.h @@ -1,8 +1,6 @@ -/** +/** @file * @author Edouard DUPIN - * * @copyright 2011, Edouard DUPIN, all right reserved - * * @license APACHE v2.0 (see license file) */ #pragma once diff --git a/ejson/internal/Document.cpp b/ejson/internal/Document.cpp index eeeb63c..18c018b 100644 --- a/ejson/internal/Document.cpp +++ b/ejson/internal/Document.cpp @@ -1,8 +1,6 @@ -/** +/** @file * @author Edouard DUPIN - * * @copyright 2011, Edouard DUPIN, all right reserved - * * @license APACHE v2.0 (see license file) */ diff --git a/ejson/internal/Document.h b/ejson/internal/Document.h index 3c3f8b0..a2c26c6 100644 --- a/ejson/internal/Document.h +++ b/ejson/internal/Document.h @@ -1,8 +1,6 @@ -/** +/** @file * @author Edouard DUPIN - * * @copyright 2011, Edouard DUPIN, all right reserved - * * @license APACHE v2.0 (see license file) */ #pragma once diff --git a/ejson/internal/Null.cpp b/ejson/internal/Null.cpp index b341afb..64e49e5 100644 --- a/ejson/internal/Null.cpp +++ b/ejson/internal/Null.cpp @@ -1,8 +1,6 @@ -/** +/** @file * @author Edouard DUPIN - * * @copyright 2011, Edouard DUPIN, all right reserved - * * @license APACHE v2.0 (see license file) */ diff --git a/ejson/internal/Null.h b/ejson/internal/Null.h index d7dd847..e2bfb0a 100644 --- a/ejson/internal/Null.h +++ b/ejson/internal/Null.h @@ -1,8 +1,6 @@ -/** +/** @file * @author Edouard DUPIN - * * @copyright 2011, Edouard DUPIN, all right reserved - * * @license APACHE v2.0 (see license file) */ #pragma once diff --git a/ejson/internal/Number.cpp b/ejson/internal/Number.cpp index bbf4b1a..2bb9294 100644 --- a/ejson/internal/Number.cpp +++ b/ejson/internal/Number.cpp @@ -1,8 +1,6 @@ -/** +/** @file * @author Edouard DUPIN - * * @copyright 2011, Edouard DUPIN, all right reserved - * * @license APACHE v2.0 (see license file) */ diff --git a/ejson/internal/Number.h b/ejson/internal/Number.h index b413a0f..1b1471c 100644 --- a/ejson/internal/Number.h +++ b/ejson/internal/Number.h @@ -1,8 +1,6 @@ -/** +/** @file * @author Edouard DUPIN - * * @copyright 2011, Edouard DUPIN, all right reserved - * * @license APACHE v2.0 (see license file) */ #pragma once diff --git a/ejson/internal/Object.cpp b/ejson/internal/Object.cpp index 7dac4d6..dfd179c 100644 --- a/ejson/internal/Object.cpp +++ b/ejson/internal/Object.cpp @@ -1,8 +1,6 @@ -/** +/** @file * @author Edouard DUPIN - * * @copyright 2011, Edouard DUPIN, all right reserved - * * @license APACHE v2.0 (see license file) */ diff --git a/ejson/internal/Object.h b/ejson/internal/Object.h index eab73e5..7c9020d 100644 --- a/ejson/internal/Object.h +++ b/ejson/internal/Object.h @@ -1,8 +1,6 @@ -/** +/** @file * @author Edouard DUPIN - * * @copyright 2011, Edouard DUPIN, all right reserved - * * @license APACHE v2.0 (see license file) */ #pragma once diff --git a/ejson/internal/String.cpp b/ejson/internal/String.cpp index d7063bb..4eeb443 100644 --- a/ejson/internal/String.cpp +++ b/ejson/internal/String.cpp @@ -1,8 +1,6 @@ -/** +/** @file * @author Edouard DUPIN - * * @copyright 2011, Edouard DUPIN, all right reserved - * * @license APACHE v2.0 (see license file) */ diff --git a/ejson/internal/String.h b/ejson/internal/String.h index b85f000..cb8ffcd 100644 --- a/ejson/internal/String.h +++ b/ejson/internal/String.h @@ -1,8 +1,6 @@ -/** +/** @file * @author Edouard DUPIN - * * @copyright 2011, Edouard DUPIN, all right reserved - * * @license APACHE v2.0 (see license file) */ #pragma once diff --git a/ejson/internal/Value.cpp b/ejson/internal/Value.cpp index 78a84af..8ad4d39 100644 --- a/ejson/internal/Value.cpp +++ b/ejson/internal/Value.cpp @@ -1,8 +1,6 @@ -/** +/** @file * @author Edouard DUPIN - * * @copyright 2011, Edouard DUPIN, all right reserved - * * @license APACHE v2.0 (see license file) */ diff --git a/ejson/internal/Value.h b/ejson/internal/Value.h index ecceacb..4e2d52b 100644 --- a/ejson/internal/Value.h +++ b/ejson/internal/Value.h @@ -1,8 +1,6 @@ -/** +/** @file * @author Edouard DUPIN - * * @copyright 2011, Edouard DUPIN, all right reserved - * * @license APACHE v2.0 (see license file) */ #pragma once diff --git a/ejson/iterator.h b/ejson/iterator.h index c5f272a..63f6658 100644 --- a/ejson/iterator.h +++ b/ejson/iterator.h @@ -1,8 +1,6 @@ /** @file * @author Edouard DUPIN - * * @copyright 2011, Edouard DUPIN, all right reserved - * * @license APACHE v2.0 (see license file) */ #pragma once diff --git a/ejson/valueType.cpp b/ejson/valueType.cpp index 4f4a2ba..2918b94 100644 --- a/ejson/valueType.cpp +++ b/ejson/valueType.cpp @@ -1,8 +1,6 @@ /** @file * @author Edouard DUPIN - * * @copyright 2011, Edouard DUPIN, all right reserved - * * @license APACHE v2.0 (see license file) */ diff --git a/ejson/valueType.h b/ejson/valueType.h index 38b4f67..51e5151 100644 --- a/ejson/valueType.h +++ b/ejson/valueType.h @@ -1,8 +1,6 @@ /** @file * @author Edouard DUPIN - * * @copyright 2011, Edouard DUPIN, all right reserved - * * @license APACHE v2.0 (see license file) */ #pragma once