commit 9efb57d62197aeb7d868c289bb34166c132f0287
author David Beck <david.beck@arm.com> Mon Nov 05 13:40:33 2018 +0000
committer Matthew Bentham <matthew.bentham@arm.com> Mon Nov 05 17:26:57 2018 +0000
tree 047fe9ac08ad90145d4e2d5bf1c6acc24eaad16c
parent 9c6f3afdf7686d9804fd5bc04ea68fca4c49a0a8

Revert "IVGCVSW-2056 + IVGCVSW-2064 : move ClContextControl to the ClBackend"

This reverts commit d4dfa684941a21314b70593d01b0fc2167eebad4.

Change-Id: Id61ce69215505c3cf5d30ec2a7ec9127fb2554fc

src/backends/reference/CMakeLists.txt

diff --git a/src/backends/reference/CMakeLists.txt b/src/backends/reference/CMakeLists.txt
index 1799275..ff16f18 100644
--- a/src/backends/reference/CMakeLists.txt
+++ b/src/backends/reference/CMakeLists.txt
@@ -23,4 +23,3 @@
 if(BUILD_UNIT_TESTS)
     add_subdirectory(test)
 endif()
-

src/backends/reference/RefBackend.cpp

diff --git a/src/backends/reference/RefBackend.cpp b/src/backends/reference/RefBackend.cpp
index 91fc3c9..b6fb0ff 100644
--- a/src/backends/reference/RefBackend.cpp
+++ b/src/backends/reference/RefBackend.cpp
@@ -9,6 +9,8 @@
 
 #include <backendsCommon/BackendRegistry.hpp>
 
+#include <boost/cast.hpp>
+
 namespace armnn
 {
 
@@ -19,7 +21,7 @@
 {
     BackendRegistryInstance(),
     RefBackend::GetIdStatic(),
-    [](const EmptyInitializer&)
+    []()
     {
         return IBackendInternalUniquePtr(new RefBackend);
     }

src/backends/reference/RefBackend.hpp

diff --git a/src/backends/reference/RefBackend.hpp b/src/backends/reference/RefBackend.hpp
index e2f264d..48a9d52 100644
--- a/src/backends/reference/RefBackend.hpp
+++ b/src/backends/reference/RefBackend.hpp
@@ -12,8 +12,8 @@
 class RefBackend : public IBackendInternal
 {
 public:
-    RefBackend() = default;
-    ~RefBackend() override = default;
+    RefBackend()  = default;
+    ~RefBackend() = default;
 
     static const BackendId& GetIdStatic();
     const BackendId& GetId() const override { return GetIdStatic(); }

src/backends/reference/RefLayerSupport.cpp

diff --git a/src/backends/reference/RefLayerSupport.cpp b/src/backends/reference/RefLayerSupport.cpp
index 1e8fa75..629903e 100644
--- a/src/backends/reference/RefLayerSupport.cpp
+++ b/src/backends/reference/RefLayerSupport.cpp
@@ -31,7 +31,7 @@
 static StaticRegistryInitializer<LayerSupportRegistry> g_RegisterHelper{
     LayerSupportRegistryInstance(),
     RefBackendId(),
-    [](const EmptyInitializer&)
+    []()
     {
         return GetLayerSupportPointer();
     }

src/backends/reference/backend.mk

diff --git a/src/backends/reference/backend.mk b/src/backends/reference/backend.mk
index 8a8a78a..007efce 100644
--- a/src/backends/reference/backend.mk
+++ b/src/backends/reference/backend.mk
@@ -71,4 +71,3 @@
         test/RefLayerTests.cpp \
         test/RefOptimizedNetworkTests.cpp \
         test/RefRuntimeTests.cpp
-