From 9efb57d62197aeb7d868c289bb34166c132f0287 Mon Sep 17 00:00:00 2001
From: David Beck <david.beck@arm.com>
Date: Mon, 5 Nov 2018 13:40:33 +0000
Subject: Revert "IVGCVSW-2056 + IVGCVSW-2064 : move ClContextControl to the
 ClBackend"

This reverts commit d4dfa684941a21314b70593d01b0fc2167eebad4.

Change-Id: Id61ce69215505c3cf5d30ec2a7ec9127fb2554fc
---
 src/backends/reference/CMakeLists.txt      | 1 -
 src/backends/reference/RefBackend.cpp      | 4 +++-
 src/backends/reference/RefBackend.hpp      | 4 ++--
 src/backends/reference/RefLayerSupport.cpp | 2 +-
 src/backends/reference/backend.mk          | 1 -
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/backends/reference')

diff --git a/src/backends/reference/CMakeLists.txt b/src/backends/reference/CMakeLists.txt
index 1799275d7d..ff16f185b4 100644
--- a/src/backends/reference/CMakeLists.txt
+++ b/src/backends/reference/CMakeLists.txt
@@ -23,4 +23,3 @@ add_subdirectory(workloads)
 if(BUILD_UNIT_TESTS)
     add_subdirectory(test)
 endif()
-
diff --git a/src/backends/reference/RefBackend.cpp b/src/backends/reference/RefBackend.cpp
index 91fc3c99ab..b6fb0ff5ec 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 @@ static StaticRegistryInitializer<BackendRegistry> g_RegisterHelper
 {
     BackendRegistryInstance(),
     RefBackend::GetIdStatic(),
-    [](const EmptyInitializer&)
+    []()
     {
         return IBackendInternalUniquePtr(new RefBackend);
     }
diff --git a/src/backends/reference/RefBackend.hpp b/src/backends/reference/RefBackend.hpp
index e2f264d7a4..48a9d529d5 100644
--- a/src/backends/reference/RefBackend.hpp
+++ b/src/backends/reference/RefBackend.hpp
@@ -12,8 +12,8 @@ namespace armnn
 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(); }
diff --git a/src/backends/reference/RefLayerSupport.cpp b/src/backends/reference/RefLayerSupport.cpp
index 1e8fa75be7..629903ec2c 100644
--- a/src/backends/reference/RefLayerSupport.cpp
+++ b/src/backends/reference/RefLayerSupport.cpp
@@ -31,7 +31,7 @@ ILayerSupportSharedPtr GetLayerSupportPointer()
 static StaticRegistryInitializer<LayerSupportRegistry> g_RegisterHelper{
     LayerSupportRegistryInstance(),
     RefBackendId(),
-    [](const EmptyInitializer&)
+    []()
     {
         return GetLayerSupportPointer();
     }
diff --git a/src/backends/reference/backend.mk b/src/backends/reference/backend.mk
index 8a8a78a315..007efceb9b 100644
--- a/src/backends/reference/backend.mk
+++ b/src/backends/reference/backend.mk
@@ -71,4 +71,3 @@ BACKEND_TEST_SOURCES := \
         test/RefLayerTests.cpp \
         test/RefOptimizedNetworkTests.cpp \
         test/RefRuntimeTests.cpp
-
-- 
cgit v1.2.1