2 files changed, 5 insertions, 4 deletions
diff --git a/src/runtime/CPP/CPPScheduler.cpp b/src/runtime/CPP/CPPScheduler.cpp
index 77aa044144..a83a0bc0d3 100644
--- a/src/runtime/CPP/CPPScheduler.cpp
+++ b/src/runtime/CPP/CPPScheduler.cpp
@@ -178,7 +178,7 @@ void CPPScheduler::schedule(ICPPKernel *kernel, unsigned int split_dimension)
 
     /** [Scheduler example] */
     ThreadInfo info;
-    info.cpu = _target;
+    info.cpu_info = _info;
 
     const Window      &max_window     = kernel->window();
     const unsigned int num_iterations = max_window.num_iterations(split_dimension);
diff --git a/src/runtime/CPP/SingleThreadScheduler.cpp b/src/runtime/CPP/SingleThreadScheduler.cpp
index 4e46a59fd0..c8285b43a7 100644
--- a/src/runtime/CPP/SingleThreadScheduler.cpp
+++ b/src/runtime/CPP/SingleThreadScheduler.cpp
@@ -27,8 +27,8 @@
 #include "arm_compute/core/Error.h"
 #include "arm_compute/core/Utils.h"
 
-using namespace arm_compute;
-
+namespace arm_compute
+{
 SingleThreadScheduler &SingleThreadScheduler::get()
 {
     static SingleThreadScheduler scheduler;
@@ -45,7 +45,7 @@ void SingleThreadScheduler::schedule(ICPPKernel *kernel, unsigned int split_dime
 {
     ARM_COMPUTE_UNUSED(split_dimension);
     ThreadInfo info;
-    info.cpu = _target;
+    info.cpu_info = cpu_info();
     kernel->run(kernel->window(), info);
 }
 
@@ -53,3 +53,4 @@ unsigned int SingleThreadScheduler::num_threads() const
 {
     return 1;
 }
+} // namespace arm_compute