diff --git a/libraries/controllers/src/controllers/Filter.cpp b/libraries/controllers/src/controllers/Filter.cpp index c9ff24fa78..94fb87c48e 100644 --- a/libraries/controllers/src/controllers/Filter.cpp +++ b/libraries/controllers/src/controllers/Filter.cpp @@ -72,7 +72,7 @@ DeadZoneFilter::FactoryEntryBuilder DeadZoneFilter::_factoryEntryBuilder; float DeadZoneFilter::apply(float value) const { float scale = 1.0f / (1.0f - _min); - if (abs(value) < _min) { + if (std::abs(value) < _min) { return 0.0f; } return (value - _min) * scale; diff --git a/libraries/controllers/src/controllers/Route.cpp b/libraries/controllers/src/controllers/Route.cpp index b9116d2813..08b6d1f4f2 100644 --- a/libraries/controllers/src/controllers/Route.cpp +++ b/libraries/controllers/src/controllers/Route.cpp @@ -6,32 +6,5 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -#pragma once -#ifndef hifi_Controllers_Route_h -#define hifi_Controllers_Route_h -#include "Endpoint.h" -#include "Filter.h" -#include "Logging.h" - -class QJsonObject; - -namespace controller { - - /* - * encapsulates a source, destination and filters to apply - */ - class Route { - public: - Endpoint::Pointer _source; - Endpoint::Pointer _destination; - Filter::List _filters; - - using Pointer = std::shared_ptr; - using List = std::list; - - void parse(const QJsonObject& json); - }; -} - -#endif +#include "Route.h"