From a584d67acde3d39fd8cda702415529e0f2c2bfb9 Mon Sep 17 00:00:00 2001 From: Simon Walton Date: Thu, 12 Apr 2018 10:44:41 -0700 Subject: [PATCH] Tweaks for clang error and gcc warning --- interface/src/main.cpp | 2 +- libraries/task/src/task/Task.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/src/main.cpp b/interface/src/main.cpp index 5f2afa9155..22db128f7e 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -264,7 +264,7 @@ int main(int argc, const char* argv[]) { QTimer exitTimer; - if (traceDuration > 0.0) { + if (traceDuration > 0.0f) { exitTimer.setSingleShot(true); QObject::connect(&exitTimer, &QTimer::timeout, &app, &Application::quit); exitTimer.start(int(1000 * traceDuration)); diff --git a/libraries/task/src/task/Task.h b/libraries/task/src/task/Task.h index c07051fda1..022dd99200 100644 --- a/libraries/task/src/task/Task.h +++ b/libraries/task/src/task/Task.h @@ -160,7 +160,7 @@ public: void applyConfiguration() override { - Duration profileRange(trace_render(), ("configure::" + getName()).c_str()); + Duration profileRange(trace_render(), ("configure::" + JobConcept::getName()).c_str()); jobConfigure(_data, *std::static_pointer_cast(Concept::_config)); }