diff --git a/source/RobotAPI/libraries/aron_component_config/PropertyDefinitionVisitors.cpp b/source/RobotAPI/libraries/aron_component_config/PropertyDefinitionVisitors.cpp
index 0220dc6bcb5c369dcd01a3faea33557d09635fe6..72c5cd6309f45fbdb07f9a82ca0cdf26990b0cd0 100644
--- a/source/RobotAPI/libraries/aron_component_config/PropertyDefinitionVisitors.cpp
+++ b/source/RobotAPI/libraries/aron_component_config/PropertyDefinitionVisitors.cpp
@@ -51,7 +51,7 @@ namespace armarx::aron::component_config
{
void
- PropertyDefinitionGetterVisitor::visitInt(DataInput& i, TypeInput& elementType)
+ PropertyDefinitionGetterVisitor::visitInt(DataInput& i, TypeInput& /*elementType*/)
{
INPUT_GUARD(i);
auto value = data::Int::DynamicCastAndCheck(i);
@@ -60,7 +60,7 @@ namespace armarx::aron::component_config
}
void
- PropertyDefinitionGetterVisitor::visitFloat(DataInput& f, TypeInput& elementType)
+ PropertyDefinitionGetterVisitor::visitFloat(DataInput& f, TypeInput& /*elementType*/)
{
INPUT_GUARD(f);
auto value = data::Float::DynamicCastAndCheck(f);
@@ -69,7 +69,7 @@ namespace armarx::aron::component_config
}
void
- PropertyDefinitionGetterVisitor::visitDouble(DataInput& d, TypeInput& elementType)
+ PropertyDefinitionGetterVisitor::visitDouble(DataInput& d, TypeInput& /*elementType*/)
{
INPUT_GUARD(d);
auto value = data::Double::DynamicCastAndCheck(d);
@@ -78,7 +78,7 @@ namespace armarx::aron::component_config
}
void
- PropertyDefinitionGetterVisitor::visitBool(DataInput& b, TypeInput& elementType)
+ PropertyDefinitionGetterVisitor::visitBool(DataInput& b, TypeInput& /*elementType*/)
{
INPUT_GUARD(b);
auto value = data::Bool::DynamicCastAndCheck(b);
@@ -87,7 +87,7 @@ namespace armarx::aron::component_config
}
void
- PropertyDefinitionGetterVisitor::visitString(DataInput& string, TypeInput& elementType)
+ PropertyDefinitionGetterVisitor::visitString(DataInput& string, TypeInput& /*elementType*/)
{
INPUT_GUARD(string);
auto value = data::String::DynamicCastAndCheck(string);
@@ -136,13 +136,13 @@ namespace armarx::aron::component_config
}
void
- PropertyDefinitionGetterVisitor::visitListOnExit(DataInput& o, TypeInput& t)
+ PropertyDefinitionGetterVisitor::visitListOnExit(DataInput& /*o*/, TypeInput& /*t*/)
{
in_list_ = false;
}
void
- PropertyDefinitionGetterVisitor::visitIntEnum(DataInput& enumData, TypeInput& elementType)
+ PropertyDefinitionGetterVisitor::visitIntEnum(DataInput& enumData, TypeInput& /*elementType*/)
{
ARMARX_TRACE;
auto data = data::Int::DynamicCastAndCheck(enumData);
@@ -151,7 +151,7 @@ namespace armarx::aron::component_config
}
void
- PropertyDefinitionGetterVisitor::visitUnknown(DataInput& unknown, TypeInput& elementType)
+ PropertyDefinitionGetterVisitor::visitUnknown(DataInput& unknown, TypeInput& /*elementType*/)
{
ARMARX_WARNING << "Unknown data encountered: "
<< (unknown ? unknown->getFullName() : "nullptr");
@@ -159,16 +159,15 @@ namespace armarx::aron::component_config
PropertyDefinitionGetterVisitor::PropertyDefinitionGetterVisitor(
const armarx::PropertyUser& defs,
- const std::string& global_namespace) :
+ const std::string& globalNamespace) :
property_user_(std::experimental::make_observer(&defs)),
- global_namespace_(global_namespace),
+ global_namespace_(globalNamespace),
in_list_(false)
{
}
void
- PropertyDefinitionGetterVisitor::visitDictOnEnter(std::shared_ptr<data::Variant>& o,
- const std::shared_ptr<type::Variant>& t)
+ PropertyDefinitionGetterVisitor::visitDictOnEnter(DataInput& o, TypeInput& t)
{
ARMARX_TRACE;
in_list_ = true;
@@ -202,9 +201,8 @@ namespace armarx::aron::component_config
}
void
- PropertyDefinitionGetterVisitor::visitDictOnExit(
- std::shared_ptr<data::Variant>& elementData,
- const std::shared_ptr<type::Variant>& elementType)
+ PropertyDefinitionGetterVisitor::visitDictOnExit(DataInput& /*elementData*/,
+ TypeInput& /*elementType*/)
{
in_list_ = false;
}
@@ -246,10 +244,9 @@ namespace armarx::aron::component_config
}
void
- PropertyDefinitionGetterVisitor::visitQuaternion(
- std::shared_ptr<data::Variant>& quaternion,
- const std::shared_ptr<type::Variant>& type)
+ PropertyDefinitionGetterVisitor::visitQuaternion(DataInput& quaternion, TypeInput& /*type*/)
{
+ INPUT_GUARD(quaternion);
auto value = data::NDArray::DynamicCastAndCheck(quaternion);
auto name = global_namespace_ + pathToName(quaternion);
const std::string property = property_user_->getProperty<std::string>(name).getValue();
@@ -259,8 +256,7 @@ namespace armarx::aron::component_config
}
void
- PropertyDefinitionGetterVisitor::visitObjectOnEnter(std::shared_ptr<data::Variant>& i,
- const std::shared_ptr<type::Variant>& j)
+ PropertyDefinitionGetterVisitor::visitObjectOnEnter(DataInput& i, TypeInput& j)
{
INPUT_GUARD(i);
if (global_namespace_.empty())
@@ -272,14 +268,15 @@ namespace armarx::aron::component_config
PropertyDefinitionSetterVisitor::PropertyDefinitionSetterVisitor(
const PropertyDefinitionsPtr& defs,
- const std::string& global_namespace) :
+ const std::string& globalNamespace) :
property_definitions_(std::experimental::make_observer(defs.get())),
- global_namespace_(global_namespace)
+ global_namespace_(globalNamespace)
{
}
void
- PropertyDefinitionSetterVisitor::visitAronVariant(const data::IntPtr& i, const type::IntPtr&)
+ PropertyDefinitionSetterVisitor::visitAronVariant(const data::IntPtr& i,
+ const type::IntPtr& /*unused*/)
{
INPUT_GUARD(i);
auto name = global_namespace_ + pathToName(i);
@@ -288,7 +285,7 @@ namespace armarx::aron::component_config
void
PropertyDefinitionSetterVisitor::visitAronVariant(const data::FloatPtr& f,
- const type::FloatPtr&)
+ const type::FloatPtr& /*unused*/)
{
INPUT_GUARD(f);
auto name = global_namespace_ + pathToName(f);
@@ -297,7 +294,7 @@ namespace armarx::aron::component_config
void
PropertyDefinitionSetterVisitor::visitAronVariant(const data::DoublePtr& d,
- const type::DoublePtr&)
+ const type::DoublePtr& /*unused*/)
{
INPUT_GUARD(d);
auto name = global_namespace_ + pathToName(d);
@@ -305,7 +302,8 @@ namespace armarx::aron::component_config
}
void
- PropertyDefinitionSetterVisitor::visitAronVariant(const data::BoolPtr& b, const type::BoolPtr&)
+ PropertyDefinitionSetterVisitor::visitAronVariant(const data::BoolPtr& b,
+ const type::BoolPtr& /*unused*/)
{
INPUT_GUARD(b);
auto name = global_namespace_ + pathToName(b);
@@ -314,7 +312,7 @@ namespace armarx::aron::component_config
void
PropertyDefinitionSetterVisitor::visitAronVariant(const data::StringPtr& string,
- const type::StringPtr& type)
+ const type::StringPtr& /*type*/)
{
INPUT_GUARD(string);
auto name = global_namespace_ + pathToName(string);
@@ -358,8 +356,8 @@ namespace armarx::aron::component_config
}
void
- PropertyDefinitionSetterVisitor::visitAronVariantOnExit(const data::ListPtr&,
- const type::ListPtr&)
+ PropertyDefinitionSetterVisitor::visitAronVariantOnExit(const data::ListPtr& /*unused*/,
+ const type::ListPtr& /*unused*/)
{
in_list_ = false;
}
@@ -394,8 +392,8 @@ namespace armarx::aron::component_config
}
void
- PropertyDefinitionSetterVisitor::visitAronVariantOnExit(const data::DictPtr&,
- const type::DictPtr&)
+ PropertyDefinitionSetterVisitor::visitAronVariantOnExit(const data::DictPtr& /*unused*/,
+ const type::DictPtr& /*unused*/)
{
in_list_ = false;
}
@@ -413,8 +411,9 @@ namespace armarx::aron::component_config
void
PropertyDefinitionSetterVisitor::visitAronVariant(const data::NDArrayPtr& quaternion,
- const type::QuaternionPtr& type)
+ const type::QuaternionPtr& /*type*/)
{
+ INPUT_GUARD(quaternion);
auto name = global_namespace_ + pathToName(quaternion);
const auto quat =
data::converter::AronEigenConverter::ConvertToQuaternion<float>(quaternion);
diff --git a/source/RobotAPI/libraries/aron_component_config/PropertyDefinitionVisitors.h b/source/RobotAPI/libraries/aron_component_config/PropertyDefinitionVisitors.h
index 4cf4ae4600f2bf69dcd358396a602de6cc7ba768..c023d65d304c468e6d8e0bc0baa270797a7ddbcb 100644
--- a/source/RobotAPI/libraries/aron_component_config/PropertyDefinitionVisitors.h
+++ b/source/RobotAPI/libraries/aron_component_config/PropertyDefinitionVisitors.h
@@ -34,7 +34,8 @@ namespace armarx::aron::component_config
class PropertyDefinitionSetterVisitor : public aron::data::RecursiveConstTypedVariantVisitor
{
public:
- explicit PropertyDefinitionSetterVisitor(const armarx::PropertyDefinitionsPtr& defs, const std::string& global_namespace = "");
+ explicit PropertyDefinitionSetterVisitor(const armarx::PropertyDefinitionsPtr& defs,
+ const std::string& global_namespace = "");
void visitAronVariant(const data::IntPtr&, const type::IntEnumPtr&) override;
@@ -71,7 +72,8 @@ namespace armarx::aron::component_config
public aron::data::RecursiveTypedVisitor<data::VariantPtr, const type::VariantPtr>
{
public:
- explicit PropertyDefinitionGetterVisitor(const armarx::PropertyUser& defs, const std::string& global_namespace = "");
+ explicit PropertyDefinitionGetterVisitor(const armarx::PropertyUser& defs,
+ const std::string& global_namespace = "");
type::Descriptor getDescriptor(DataInput& o, TypeInput& t) override;