From 416df1c44c7f1c181ab7fd81e66f5888a3bfb4a2 Mon Sep 17 00:00:00 2001 From: samcake Date: Thu, 15 Oct 2015 14:21:08 -0700 Subject: [PATCH] Fixing the mac build --- libraries/controllers/src/controllers/Filter.h | 2 +- .../src/controllers/impl/RouteBuilderProxy.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/controllers/src/controllers/Filter.h b/libraries/controllers/src/controllers/Filter.h index 4d8c483b08..876f57c97d 100644 --- a/libraries/controllers/src/controllers/Filter.h +++ b/libraries/controllers/src/controllers/Filter.h @@ -76,7 +76,7 @@ namespace controller { } Filter* create(const std::string& name) const { - auto& entryIt = _entries.find(name); + const auto& entryIt = _entries.find(name); if (entryIt != _entries.end()) { return (*entryIt).second->create(); } diff --git a/libraries/controllers/src/controllers/impl/RouteBuilderProxy.cpp b/libraries/controllers/src/controllers/impl/RouteBuilderProxy.cpp index aeef081b5f..dcf2b30f66 100644 --- a/libraries/controllers/src/controllers/impl/RouteBuilderProxy.cpp +++ b/libraries/controllers/src/controllers/impl/RouteBuilderProxy.cpp @@ -121,12 +121,12 @@ QObject* RouteBuilderProxy::filters(const QJsonValue& json) { } void RouteBuilderProxy::to(const QJsonValue& json) { - if (json.isString()) { - - return to(_parent.endpointFor(_parent.inputFor(json.toString()))); + if (json.isString()) { + + return to(_parent.endpointFor(_parent.inputFor(json.toString()))); } else if (json.isObject()) { // Endpoint is defined as an object, we expect a js function then - return to(nullptr); + //return to((Endpoint*) nullptr); } }