[arrayfire] 04/79: Fixing conflicts between std::array and af::array

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch master
in repository arrayfire.

commit ee0c29586867988694171a6052da7ccdd743ff2b
Author: Shehzan Mohammed <shehzan at arrayfire.com>
Date:   Wed Jun 3 11:58:16 2015 -0400

    Fixing conflicts between std::array and af::array
---
 test/array.cpp               | 2 +-
 test/constant.cpp            | 2 +-
 test/diagonal.cpp            | 6 +++---
 test/getting_started.cpp     | 2 +-
 test/matrix_manipulation.cpp | 2 +-
 test/median.cpp              | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/test/array.cpp b/test/array.cpp
index db2cf5a..47a593d 100644
--- a/test/array.cpp
+++ b/test/array.cpp
@@ -4,7 +4,7 @@
 #include <testHelpers.hpp>
 
 using namespace af;
-using namespace std;
+using std::vector;
 
 template<typename T>
 class Array : public ::testing::Test
diff --git a/test/constant.cpp b/test/constant.cpp
index 328b0f7..8f65582 100644
--- a/test/constant.cpp
+++ b/test/constant.cpp
@@ -13,8 +13,8 @@
 #include <af/data.h>
 #include <testHelpers.hpp>
 
-using namespace std;
 using namespace af;
+using std::vector;
 
 template<typename T>
 class Constant : public ::testing::Test { };
diff --git a/test/diagonal.cpp b/test/diagonal.cpp
index 16d67af..1ab0d33 100644
--- a/test/diagonal.cpp
+++ b/test/diagonal.cpp
@@ -4,8 +4,8 @@
 #include <arrayfire.h>
 #include <iostream>
 
-using namespace std;
 using namespace af;
+using std::vector;
 
 template<typename T>
 class Diagonal : public ::testing::Test
@@ -41,7 +41,7 @@ TYPED_TEST(Diagonal, Create)
             }
         }
     } catch (const af::exception& ex) {
-        FAIL() << ex.what() << endl;
+        FAIL() << ex.what() << std::endl;
     }
 }
 
@@ -67,7 +67,7 @@ TYPED_TEST(Diagonal, Extract)
             }
         }
     } catch (const af::exception& ex) {
-        FAIL() << ex.what() << endl;
+        FAIL() << ex.what() << std::endl;
     }
 }
 
diff --git a/test/getting_started.cpp b/test/getting_started.cpp
index fce6485..7d77757 100644
--- a/test/getting_started.cpp
+++ b/test/getting_started.cpp
@@ -14,7 +14,7 @@
 #include <testHelpers.hpp>
 
 using namespace af;
-using namespace std;
+using std::vector;
 
 TEST(GettingStarted, SNIPPET_getting_started_gen)
 {
diff --git a/test/matrix_manipulation.cpp b/test/matrix_manipulation.cpp
index ded90ef..9ab61ff 100644
--- a/test/matrix_manipulation.cpp
+++ b/test/matrix_manipulation.cpp
@@ -13,7 +13,7 @@
 #include <vector>
 
 using namespace af;
-using namespace std;
+using std::vector;
 
 TEST(MatrixManipulation, SNIPPET_matrix_manipulation_tile)
 {
diff --git a/test/median.cpp b/test/median.cpp
index f613ea5..86dee96 100644
--- a/test/median.cpp
+++ b/test/median.cpp
@@ -13,8 +13,8 @@
 #include <af/data.h>
 #include <testHelpers.hpp>
 
-using namespace std;
 using namespace af;
+using std::vector;
 
 template<typename To, typename Ti, bool flat>
 void median0(int nx, int ny=1, int nz=1, int nw=1)

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