summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Shapovalov <intelfx@intelfx.name>2016-11-26 13:42:18 +0300
committerIvan Shapovalov <intelfx@intelfx.name>2017-01-20 17:32:42 +0300
commit1a1e863ab305faadfad8a20c4ff7875b6300592b (patch)
treecd10e33c055a7da67fb77eb7ba966d44df5e887b
parent43c7707173434da61ff83dbc79956c9b192bcecf (diff)
treewide: include clpp11.hpp first to silence deprecation warnings
Otherwise, cl.h gets included through clblast.h before clpp11.hpp.
-rw-r--r--src/clblast.cpp2
-rw-r--r--src/clblast_c.cpp2
-rw-r--r--src/routines/common.hpp2
-rw-r--r--src/utilities/clblast_exceptions.hpp2
-rw-r--r--src/utilities/utilities.hpp2
-rw-r--r--test/correctness/tester.hpp4
-rw-r--r--test/performance/client.hpp4
7 files changed, 9 insertions, 9 deletions
diff --git a/src/clblast.cpp b/src/clblast.cpp
index 4bb4e0b3..6a47316e 100644
--- a/src/clblast.cpp
+++ b/src/clblast.cpp
@@ -15,8 +15,8 @@
#include <string>
-#include "clblast.h"
#include "cache.hpp"
+#include "clblast.h"
// BLAS level-1 includes
#include "routines/level1/xswap.hpp"
diff --git a/src/clblast_c.cpp b/src/clblast_c.cpp
index 59e4cd16..e4f2b3ed 100644
--- a/src/clblast_c.cpp
+++ b/src/clblast_c.cpp
@@ -13,9 +13,9 @@
#include <string>
+#include "utilities/utilities.hpp"
#include "clblast_c.h"
#include "clblast.h"
-#include "utilities/utilities.hpp"
// Shortcuts to the clblast namespace
using float2 = clblast::float2;
diff --git a/src/routines/common.hpp b/src/routines/common.hpp
index 53ca6355..7c211c0d 100644
--- a/src/routines/common.hpp
+++ b/src/routines/common.hpp
@@ -19,8 +19,8 @@
#include <string>
#include <vector>
-#include "clblast.h"
#include "clpp11.hpp"
+#include "clblast.h"
#include "database/database.hpp"
namespace clblast {
diff --git a/src/utilities/clblast_exceptions.hpp b/src/utilities/clblast_exceptions.hpp
index f3c7b9a3..0d0033b6 100644
--- a/src/utilities/clblast_exceptions.hpp
+++ b/src/utilities/clblast_exceptions.hpp
@@ -16,8 +16,8 @@
#ifndef CLBLAST_EXCEPTIONS_H_
#define CLBLAST_EXCEPTIONS_H_
-#include "clblast.h"
#include "clpp11.hpp"
+#include "clblast.h"
namespace clblast {
// =================================================================================================
diff --git a/src/utilities/utilities.hpp b/src/utilities/utilities.hpp
index 20587bd4..a1d4e2db 100644
--- a/src/utilities/utilities.hpp
+++ b/src/utilities/utilities.hpp
@@ -21,9 +21,9 @@
#include <functional>
#include <complex>
+#include "clpp11.hpp"
#include "clblast.h"
#include "clblast_half.h"
-#include "clpp11.hpp"
#include "utilities/clblast_exceptions.hpp"
#include "utilities/msvc.hpp"
diff --git a/test/correctness/tester.hpp b/test/correctness/tester.hpp
index d8462cef..113f03ef 100644
--- a/test/correctness/tester.hpp
+++ b/test/correctness/tester.hpp
@@ -22,14 +22,14 @@
#include <vector>
#include <memory>
+#include "utilities/utilities.hpp"
+
// The libraries
#ifdef CLBLAST_REF_CLBLAS
#include <clBLAS.h>
#endif
#include "clblast.h"
-#include "utilities/utilities.hpp"
-
namespace clblast {
// =================================================================================================
diff --git a/test/performance/client.hpp b/test/performance/client.hpp
index 4554c67f..4b3e17c7 100644
--- a/test/performance/client.hpp
+++ b/test/performance/client.hpp
@@ -25,14 +25,14 @@
#include <vector>
#include <utility>
+#include "utilities/utilities.hpp"
+
// The libraries to test
#ifdef CLBLAST_REF_CLBLAS
#include <clBLAS.h>
#endif
#include "clblast.h"
-#include "utilities/utilities.hpp"
-
namespace clblast {
// =================================================================================================