[arrayfire] 87/284: moved kernel namespace in cpu backend inside cpu namespace

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/experimental
in repository arrayfire.

commit 0e563bac8d11c961450288a78ce9f4119cb68466
Author: pradeep <pradeep at arrayfire.com>
Date:   Fri Dec 18 15:54:35 2015 -0500

    moved kernel namespace in cpu backend inside cpu namespace
---
 src/backend/cpu/Array.hpp          | 3 +--
 src/backend/cpu/kernel/Array.hpp   | 4 +++-
 src/backend/cpu/kernel/approx1.hpp | 6 +++---
 src/backend/cpu/kernel/approx2.hpp | 5 +++--
 src/backend/cpu/kernel/assign.hpp  | 4 +++-
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/backend/cpu/Array.hpp b/src/backend/cpu/Array.hpp
index 437c47f..adb72dc 100644
--- a/src/backend/cpu/Array.hpp
+++ b/src/backend/cpu/Array.hpp
@@ -27,13 +27,12 @@
 namespace cpu
 {
 template<typename T> class Array;
-}
-
 // kernel::evalArray fn forward declaration
 namespace kernel
 {
 template<typename T> void evalArray(cpu::Array<T> in);
 }
+}
 
 namespace cpu
 {
diff --git a/src/backend/cpu/kernel/Array.hpp b/src/backend/cpu/kernel/Array.hpp
index b3a0200..e492b92 100644
--- a/src/backend/cpu/kernel/Array.hpp
+++ b/src/backend/cpu/kernel/Array.hpp
@@ -10,11 +10,12 @@
 #include <Array.hpp>
 #include <platform.hpp>
 
+namespace cpu
+{
 namespace kernel
 {
 
 using af::dim4;
-using cpu::Array;
 
 template<typename T>
 void evalArray(Array<T> in)
@@ -54,3 +55,4 @@ void evalArray(Array<T> in)
 }
 
 }
+}
diff --git a/src/backend/cpu/kernel/approx1.hpp b/src/backend/cpu/kernel/approx1.hpp
index 9dc681c..63bae2d 100644
--- a/src/backend/cpu/kernel/approx1.hpp
+++ b/src/backend/cpu/kernel/approx1.hpp
@@ -9,13 +9,12 @@
 
 #include <Array.hpp>
 #include <math.hpp>
-
+namespace cpu
+{
 namespace kernel
 {
 
 using af::dim4;
-using cpu::scalar;
-using cpu::Array;
 
 template<typename Ty, typename Tp, af_interp_type method>
 struct approx1_op
@@ -139,3 +138,4 @@ void approx1(Array<Ty> output, Array<Ty> const input,
 }
 
 }
+}
diff --git a/src/backend/cpu/kernel/approx2.hpp b/src/backend/cpu/kernel/approx2.hpp
index 8f57b5c..f80dae1 100644
--- a/src/backend/cpu/kernel/approx2.hpp
+++ b/src/backend/cpu/kernel/approx2.hpp
@@ -10,12 +10,12 @@
 #include <Array.hpp>
 #include <math.hpp>
 
+namespace cpu
+{
 namespace kernel
 {
 
 using af::dim4;
-using cpu::scalar;
-using cpu::Array;
 
 template<typename Ty, typename Tp, af_interp_type method>
 struct approx2_op
@@ -167,3 +167,4 @@ void approx2(Array<Ty> output, Array<Ty> const input,
 }
 
 }
+}
diff --git a/src/backend/cpu/kernel/assign.hpp b/src/backend/cpu/kernel/assign.hpp
index 16a623f..2621ba7 100644
--- a/src/backend/cpu/kernel/assign.hpp
+++ b/src/backend/cpu/kernel/assign.hpp
@@ -10,11 +10,12 @@
 #include <Array.hpp>
 #include <vector>
 
+namespace cpu
+{
 namespace kernel
 {
 
 using af::dim4;
-using cpu::Array;
 using std::vector;
 
 inline
@@ -89,3 +90,4 @@ void assign(Array<T> out, const Array<T> rhs, const vector<bool> isSeq,
 }
 
 }
+}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/arrayfire.git