Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-02 11:13:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing the mac build

Browse source
This commit is contained in:
samcake 2015-10-15 14:21:08 -07:00
parent cdfe9788d1
commit 416df1c44c
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/controllers/src/controllers/Filter.h
View file

@ -76,7 +76,7 @@ namespace controller {
} }
Filter* create(const std::string& name) const { Filter* create(const std::string& name) const {
auto& entryIt = _entries.find(name); const auto& entryIt = _entries.find(name);
if (entryIt != _entries.end()) { if (entryIt != _entries.end()) {
return (*entryIt).second->create(); return (*entryIt).second->create();
} }

8
libraries/controllers/src/controllers/impl/RouteBuilderProxy.cpp
View file

@ -121,12 +121,12 @@ QObject* RouteBuilderProxy::filters(const QJsonValue& json) {
} }
void RouteBuilderProxy::to(const QJsonValue& json) { void RouteBuilderProxy::to(const QJsonValue& json) {
if (json.isString()) { if (json.isString()) {
return to(_parent.endpointFor(_parent.inputFor(json.toString()))); return to(_parent.endpointFor(_parent.inputFor(json.toString())));
} else if (json.isObject()) { } else if (json.isObject()) {
// Endpoint is defined as an object, we expect a js function then // Endpoint is defined as an object, we expect a js function then
return to(nullptr); //return to((Endpoint*) nullptr);
} }
} }