From 1c3bc0aa67a903736b01d1e1246d2b66d02f74c9 Mon Sep 17 00:00:00 2001
From: samcake <samuel.gateau@gmail.com>
Date: Wed, 21 Feb 2018 11:18:41 -0800
Subject: [PATCH] addressing review and warnings

---
 interface/src/workload/GameWorkloadRenderer.cpp | 5 +++--
 libraries/workload/src/workload/Engine.h        | 6 ++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/interface/src/workload/GameWorkloadRenderer.cpp b/interface/src/workload/GameWorkloadRenderer.cpp
index e10c28c36c..99a784a511 100644
--- a/interface/src/workload/GameWorkloadRenderer.cpp
+++ b/interface/src/workload/GameWorkloadRenderer.cpp
@@ -9,6 +9,7 @@
 //
 #include "GameWorkloadRenderer.h"
 
+#include <cstring>
 #include <gpu/Context.h>
 
 
@@ -28,7 +29,7 @@ void GameSpaceToRender::run(const workload::WorkloadContextPointer& runContext,
     if (!render::Item::isValidID(_spaceRenderItemID)) {
         _spaceRenderItemID = scene->allocateID();
         auto renderItem = std::make_shared<GameWorkloadRenderItem>();
-        renderItem->editBound().expandedContains(glm::vec3(0.0), 32000.0);
+        renderItem->editBound().expandedContains(glm::vec3(0.0f), 32000.0f);
         transaction.resetItem(_spaceRenderItemID, std::make_shared<GameWorkloadRenderItem::Payload>(std::make_shared<GameWorkloadRenderItem>()));
         scene->enqueueTransaction(transaction);
     }
@@ -41,7 +42,7 @@ void GameSpaceToRender::run(const workload::WorkloadContextPointer& runContext,
 
     std::vector<workload::Space::Proxy> proxies(space->getNumAllocatedProxies());
 
-    space->copyProxyValues(proxies.data(), proxies.size());
+    space->copyProxyValues(proxies.data(), (uint32_t) proxies.size());
 
     transaction.updateItem<GameWorkloadRenderItem>(_spaceRenderItemID, [proxies](GameWorkloadRenderItem& item) {
         item.setAllProxies(proxies);
diff --git a/libraries/workload/src/workload/Engine.h b/libraries/workload/src/workload/Engine.h
index 365461a4a3..08abe23e35 100644
--- a/libraries/workload/src/workload/Engine.h
+++ b/libraries/workload/src/workload/Engine.h
@@ -47,7 +47,7 @@ namespace workload {
         Q_PROPERTY(QString message READ getMessage WRITE setMessage)
         QString _message {"Hello World."};
     public:
-	    HelloWorldConfig() : Job::Config(true) {}
+        HelloWorldConfig() : Job::Config(true) {}
         QString getMessage() const { return _message; }
         void setMessage(const QString& msg) { _message = msg; }
     };
@@ -64,9 +64,11 @@ namespace workload {
         ~Engine() = default;
 
         // (6) The Engine's Context is passed to its Jobs when they are run()
-        void run() { assert(_context); Task::run(_context); }
+        void run() { assert(_context); run(_context); }
 
     protected:
+        // (6) Again, the Engine's Context is passed to its Jobs when they are run()
+        void run(const WorkloadContextPointer& context) override { assert(_context); Task::run(_context); }
 
     private:
         WorkloadContextPointer _context;