diff options
Diffstat (limited to 'src/components/smart_objects/include')
7 files changed, 24 insertions, 23 deletions
diff --git a/src/components/smart_objects/include/smart_objects/array_schema_item.h b/src/components/smart_objects/include/smart_objects/array_schema_item.h index 7706b6e091..0e19d2237e 100644 --- a/src/components/smart_objects/include/smart_objects/array_schema_item.h +++ b/src/components/smart_objects/include/smart_objects/array_schema_item.h @@ -34,8 +34,8 @@ #include <stddef.h> -#include "smart_objects/schema_item.h" #include "smart_objects/always_true_schema_item.h" +#include "smart_objects/schema_item.h" #include "smart_objects/schema_item_parameter.h" #include "utils/semantic_version.h" diff --git a/src/components/smart_objects/include/smart_objects/default_shema_item.h b/src/components/smart_objects/include/smart_objects/default_shema_item.h index beeeaac81f..16dbad4426 100644 --- a/src/components/smart_objects/include/smart_objects/default_shema_item.h +++ b/src/components/smart_objects/include/smart_objects/default_shema_item.h @@ -113,10 +113,10 @@ errors::eType CDefaultSchemaItem<Type>::validate( const utils::SemanticVersion& MessageVersion, const bool allow_unknown_enums) { if (getSmartType() != Object.getType()) { - std::string validation_info = "Incorrect type, expected: " + - SmartObject::typeToString(getSmartType()) + - ", got: " + - SmartObject::typeToString(Object.getType()); + std::string validation_info = + "Incorrect type, expected: " + + SmartObject::typeToString(getSmartType()) + + ", got: " + SmartObject::typeToString(Object.getType()); report__->set_validation_info(validation_info); return errors::INVALID_VALUE; } else { diff --git a/src/components/smart_objects/include/smart_objects/enum_schema_item.h b/src/components/smart_objects/include/smart_objects/enum_schema_item.h index 2a27f765d2..053ad98395 100644 --- a/src/components/smart_objects/include/smart_objects/enum_schema_item.h +++ b/src/components/smart_objects/include/smart_objects/enum_schema_item.h @@ -41,8 +41,8 @@ #include "smart_objects/default_shema_item.h" -#include "utils/semantic_version.h" #include <boost/optional.hpp> +#include "utils/semantic_version.h" namespace ns_smart_device_link { namespace ns_smart_objects { @@ -325,10 +325,10 @@ errors::eType TEnumSchemaItem<EnumType>::validate( } validation_info = "Invalid enum value: " + Object.asString(); } else { - validation_info = "Incorrect type, expected: " + - SmartObject::typeToString(SmartType_Integer) + - " (enum), got: " + - SmartObject::typeToString(Object.getType()); + validation_info = + "Incorrect type, expected: " + + SmartObject::typeToString(SmartType_Integer) + + " (enum), got: " + SmartObject::typeToString(Object.getType()); } report__->set_validation_info(validation_info); return errors::INVALID_VALUE; diff --git a/src/components/smart_objects/include/smart_objects/number_schema_item.h b/src/components/smart_objects/include/smart_objects/number_schema_item.h index b3e227e0f1..c3767e8e48 100644 --- a/src/components/smart_objects/include/smart_objects/number_schema_item.h +++ b/src/components/smart_objects/include/smart_objects/number_schema_item.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_SMART_OBJECTS_INCLUDE_SMART_OBJECTS_NUMBER_SCHEMA_ITEM_H_ #define SRC_COMPONENTS_SMART_OBJECTS_INCLUDE_SMART_OBJECTS_NUMBER_SCHEMA_ITEM_H_ -#include <typeinfo> #include <limits> +#include <typeinfo> #include "smart_objects/default_shema_item.h" #include "smart_objects/schema_item_parameter.h" @@ -113,10 +113,11 @@ class TNumberSchemaItem : public CDefaultSchemaItem<NumberType> { }; template <typename NumberType> -std::shared_ptr<TNumberSchemaItem<NumberType> > TNumberSchemaItem< - NumberType>::create(const TSchemaItemParameter<NumberType>& MinValue, - const TSchemaItemParameter<NumberType>& MaxValue, - const TSchemaItemParameter<NumberType>& DefaultValue) { +std::shared_ptr<TNumberSchemaItem<NumberType> > +TNumberSchemaItem<NumberType>::create( + const TSchemaItemParameter<NumberType>& MinValue, + const TSchemaItemParameter<NumberType>& MaxValue, + const TSchemaItemParameter<NumberType>& DefaultValue) { return std::shared_ptr<TNumberSchemaItem<NumberType> >( new TNumberSchemaItem<NumberType>(MinValue, MaxValue, DefaultValue)); } diff --git a/src/components/smart_objects/include/smart_objects/object_schema_item.h b/src/components/smart_objects/include/smart_objects/object_schema_item.h index 7b57792c1e..7f51ae5678 100644 --- a/src/components/smart_objects/include/smart_objects/object_schema_item.h +++ b/src/components/smart_objects/include/smart_objects/object_schema_item.h @@ -33,12 +33,12 @@ #define SRC_COMPONENTS_SMART_OBJECTS_INCLUDE_SMART_OBJECTS_OBJECT_SCHEMA_ITEM_H_ #include <map> -#include <string> #include <set> +#include <string> +#include <boost/optional.hpp> #include "utils/macro.h" #include "utils/semantic_version.h" -#include <boost/optional.hpp> #include "smart_objects/schema_item.h" #include "smart_objects/schema_item_parameter.h" diff --git a/src/components/smart_objects/include/smart_objects/smart_object.h b/src/components/smart_objects/include/smart_objects/smart_object.h index b862d25a17..f3aab0fc1e 100644 --- a/src/components/smart_objects/include/smart_objects/smart_object.h +++ b/src/components/smart_objects/include/smart_objects/smart_object.h @@ -33,15 +33,15 @@ #ifndef SRC_COMPONENTS_SMART_OBJECTS_INCLUDE_SMART_OBJECTS_SMART_OBJECT_H_ #define SRC_COMPONENTS_SMART_OBJECTS_INCLUDE_SMART_OBJECTS_SMART_OBJECT_H_ +#include <map> #include <set> -#include <string> #include <sstream> +#include <string> #include <vector> -#include <map> +#include "rpc_base/validation_report.h" #include "smart_objects/smart_schema.h" #include "utils/custom_string.h" -#include "rpc_base/validation_report.h" namespace ns_smart_device_link { namespace ns_smart_objects { @@ -299,8 +299,8 @@ class SmartObject FINAL { bool operator==(const int64_t Value) const; /** - * @name Support of type: uint64_t - * @{ + * @name Support of type: uint64_t + * @{ **/ /** diff --git a/src/components/smart_objects/include/smart_objects/smart_schema.h b/src/components/smart_objects/include/smart_objects/smart_schema.h index ece2696539..936f49c11e 100644 --- a/src/components/smart_objects/include/smart_objects/smart_schema.h +++ b/src/components/smart_objects/include/smart_objects/smart_schema.h @@ -32,8 +32,8 @@ #ifndef SRC_COMPONENTS_SMART_OBJECTS_INCLUDE_SMART_OBJECTS_SMART_SCHEMA_H_ #define SRC_COMPONENTS_SMART_OBJECTS_INCLUDE_SMART_OBJECTS_SMART_SCHEMA_H_ -#include "utils/macro.h" #include "smart_objects/schema_item.h" +#include "utils/macro.h" namespace ns_smart_device_link { namespace ns_smart_objects { |