From cc95fcd32783f4cbe680ef811a559190c60fba4d Mon Sep 17 00:00:00 2001
From: Klaus Iglberger <klaus.iglberger@gmail.com>
Date: Sun, 24 Aug 2014 07:18:36 +0200
Subject: [PATCH] Add the missing <util/Types.h> include to several math header
 files

---
 blaze/math/dense/Forward.h             | 7 +++++++
 blaze/math/expressions/Matrix.h        | 1 +
 blaze/math/expressions/Vector.h        | 1 +
 blaze/math/intrinsics/Load.h           | 1 +
 blaze/math/intrinsics/Loadu.h          | 1 +
 blaze/math/intrinsics/Set.h            | 1 +
 blaze/math/intrinsics/Store.h          | 1 +
 blaze/math/intrinsics/Storeu.h         | 1 +
 blaze/math/intrinsics/Stream.h         | 1 +
 blaze/math/smp/default/Functions.h     | 1 +
 blaze/math/smp/openmp/DenseMatrix.h    | 1 +
 blaze/math/smp/openmp/DenseVector.h    | 1 +
 blaze/math/smp/openmp/Functions.h      | 1 +
 blaze/math/smp/threads/DenseMatrix.h   | 1 +
 blaze/math/smp/threads/DenseVector.h   | 1 +
 blaze/math/smp/threads/Functions.h     | 1 +
 blaze/math/smp/threads/ThreadBackend.h | 1 +
 blaze/math/sparse/ValueIndexPair.h     | 1 +
 blaze/math/typetraits/Columns.h        | 9 ++++++++-
 blaze/math/typetraits/Rows.h           | 9 ++++++++-
 blaze/math/typetraits/Size.h           | 9 ++++++++-
 21 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/blaze/math/dense/Forward.h b/blaze/math/dense/Forward.h
index 258f0c90..da1d2c71 100644
--- a/blaze/math/dense/Forward.h
+++ b/blaze/math/dense/Forward.h
@@ -36,6 +36,13 @@
 #define _BLAZE_MATH_DENSE_FORWARD_H_
 
 
+//*************************************************************************************************
+// Includes
+//*************************************************************************************************
+
+#include <blaze/util/Types.h>
+
+
 namespace blaze {
 
 //=================================================================================================
diff --git a/blaze/math/expressions/Matrix.h b/blaze/math/expressions/Matrix.h
index 63008558..7bb13643 100644
--- a/blaze/math/expressions/Matrix.h
+++ b/blaze/math/expressions/Matrix.h
@@ -42,6 +42,7 @@
 
 #include <blaze/util/Assert.h>
 #include <blaze/util/logging/FunctionTrace.h>
+#include <blaze/util/Types.h>
 #include <blaze/util/typetraits/IsSame.h>
 
 
diff --git a/blaze/math/expressions/Vector.h b/blaze/math/expressions/Vector.h
index 3d065d86..78d184d3 100644
--- a/blaze/math/expressions/Vector.h
+++ b/blaze/math/expressions/Vector.h
@@ -42,6 +42,7 @@
 
 #include <blaze/util/Assert.h>
 #include <blaze/util/logging/FunctionTrace.h>
+#include <blaze/util/Types.h>
 #include <blaze/util/typetraits/IsSame.h>
 
 
diff --git a/blaze/math/intrinsics/Load.h b/blaze/math/intrinsics/Load.h
index f7b8beea..a375d672 100644
--- a/blaze/math/intrinsics/Load.h
+++ b/blaze/math/intrinsics/Load.h
@@ -48,6 +48,7 @@
 #include <blaze/util/constraints/Integral.h>
 #include <blaze/util/EnableIf.h>
 #include <blaze/util/StaticAssert.h>
+#include <blaze/util/Types.h>
 
 
 namespace blaze {
diff --git a/blaze/math/intrinsics/Loadu.h b/blaze/math/intrinsics/Loadu.h
index 042295ef..735c0d39 100644
--- a/blaze/math/intrinsics/Loadu.h
+++ b/blaze/math/intrinsics/Loadu.h
@@ -46,6 +46,7 @@
 #include <blaze/util/constraints/Integral.h>
 #include <blaze/util/EnableIf.h>
 #include <blaze/util/StaticAssert.h>
+#include <blaze/util/Types.h>
 
 
 namespace blaze {
diff --git a/blaze/math/intrinsics/Set.h b/blaze/math/intrinsics/Set.h
index fb611dc5..f4945a12 100644
--- a/blaze/math/intrinsics/Set.h
+++ b/blaze/math/intrinsics/Set.h
@@ -46,6 +46,7 @@
 #include <blaze/util/constraints/Integral.h>
 #include <blaze/util/EnableIf.h>
 #include <blaze/util/StaticAssert.h>
+#include <blaze/util/Types.h>
 
 
 namespace blaze {
diff --git a/blaze/math/intrinsics/Store.h b/blaze/math/intrinsics/Store.h
index 31389838..110150dc 100644
--- a/blaze/math/intrinsics/Store.h
+++ b/blaze/math/intrinsics/Store.h
@@ -48,6 +48,7 @@
 #include <blaze/util/constraints/Integral.h>
 #include <blaze/util/EnableIf.h>
 #include <blaze/util/StaticAssert.h>
+#include <blaze/util/Types.h>
 
 
 namespace blaze {
diff --git a/blaze/math/intrinsics/Storeu.h b/blaze/math/intrinsics/Storeu.h
index 4cbd8d13..fb4273ba 100644
--- a/blaze/math/intrinsics/Storeu.h
+++ b/blaze/math/intrinsics/Storeu.h
@@ -46,6 +46,7 @@
 #include <blaze/util/constraints/Integral.h>
 #include <blaze/util/EnableIf.h>
 #include <blaze/util/StaticAssert.h>
+#include <blaze/util/Types.h>
 
 
 namespace blaze {
diff --git a/blaze/math/intrinsics/Stream.h b/blaze/math/intrinsics/Stream.h
index 0dc91c39..a48f8405 100644
--- a/blaze/math/intrinsics/Stream.h
+++ b/blaze/math/intrinsics/Stream.h
@@ -48,6 +48,7 @@
 #include <blaze/util/constraints/Integral.h>
 #include <blaze/util/EnableIf.h>
 #include <blaze/util/StaticAssert.h>
+#include <blaze/util/Types.h>
 
 
 namespace blaze {
diff --git a/blaze/math/smp/default/Functions.h b/blaze/math/smp/default/Functions.h
index 575f528b..f8675c64 100644
--- a/blaze/math/smp/default/Functions.h
+++ b/blaze/math/smp/default/Functions.h
@@ -42,6 +42,7 @@
 
 #include <blaze/system/SMP.h>
 #include <blaze/util/StaticAssert.h>
+#include <blaze/util/Types.h>
 #include <blaze/util/Unused.h>
 
 
diff --git a/blaze/math/smp/openmp/DenseMatrix.h b/blaze/math/smp/openmp/DenseMatrix.h
index c85c992a..c2277d49 100644
--- a/blaze/math/smp/openmp/DenseMatrix.h
+++ b/blaze/math/smp/openmp/DenseMatrix.h
@@ -60,6 +60,7 @@
 #include <blaze/util/logging/FunctionTrace.h>
 #include <blaze/util/mpl/And.h>
 #include <blaze/util/StaticAssert.h>
+#include <blaze/util/Types.h>
 #include <blaze/util/typetraits/IsSame.h>
 
 
diff --git a/blaze/math/smp/openmp/DenseVector.h b/blaze/math/smp/openmp/DenseVector.h
index f817063a..75bb37ea 100644
--- a/blaze/math/smp/openmp/DenseVector.h
+++ b/blaze/math/smp/openmp/DenseVector.h
@@ -59,6 +59,7 @@
 #include <blaze/util/logging/FunctionTrace.h>
 #include <blaze/util/mpl/And.h>
 #include <blaze/util/StaticAssert.h>
+#include <blaze/util/Types.h>
 #include <blaze/util/typetraits/IsSame.h>
 
 
diff --git a/blaze/math/smp/openmp/Functions.h b/blaze/math/smp/openmp/Functions.h
index 3d94cde4..239b22cb 100644
--- a/blaze/math/smp/openmp/Functions.h
+++ b/blaze/math/smp/openmp/Functions.h
@@ -44,6 +44,7 @@
 #include <omp.h>
 #include <blaze/system/SMP.h>
 #include <blaze/util/StaticAssert.h>
+#include <blaze/util/Types.h>
 
 
 namespace blaze {
diff --git a/blaze/math/smp/threads/DenseMatrix.h b/blaze/math/smp/threads/DenseMatrix.h
index c02adcda..c81471c5 100644
--- a/blaze/math/smp/threads/DenseMatrix.h
+++ b/blaze/math/smp/threads/DenseMatrix.h
@@ -60,6 +60,7 @@
 #include <blaze/util/logging/FunctionTrace.h>
 #include <blaze/util/mpl/And.h>
 #include <blaze/util/StaticAssert.h>
+#include <blaze/util/Types.h>
 #include <blaze/util/typetraits/IsSame.h>
 
 
diff --git a/blaze/math/smp/threads/DenseVector.h b/blaze/math/smp/threads/DenseVector.h
index 62eaccbe..1c3f9529 100644
--- a/blaze/math/smp/threads/DenseVector.h
+++ b/blaze/math/smp/threads/DenseVector.h
@@ -59,6 +59,7 @@
 #include <blaze/util/logging/FunctionTrace.h>
 #include <blaze/util/mpl/And.h>
 #include <blaze/util/StaticAssert.h>
+#include <blaze/util/Types.h>
 #include <blaze/util/typetraits/IsSame.h>
 
 
diff --git a/blaze/math/smp/threads/Functions.h b/blaze/math/smp/threads/Functions.h
index 092f27a1..50dab494 100644
--- a/blaze/math/smp/threads/Functions.h
+++ b/blaze/math/smp/threads/Functions.h
@@ -44,6 +44,7 @@
 #include <blaze/math/smp/threads/ThreadBackend.h>
 #include <blaze/system/SMP.h>
 #include <blaze/util/StaticAssert.h>
+#include <blaze/util/Types.h>
 
 
 namespace blaze {
diff --git a/blaze/math/smp/threads/ThreadBackend.h b/blaze/math/smp/threads/ThreadBackend.h
index 55919d16..d3beee19 100644
--- a/blaze/math/smp/threads/ThreadBackend.h
+++ b/blaze/math/smp/threads/ThreadBackend.h
@@ -57,6 +57,7 @@
 #include <blaze/util/constraints/Const.h>
 #include <blaze/util/StaticAssert.h>
 #include <blaze/util/ThreadPool.h>
+#include <blaze/util/Types.h>
 
 
 namespace blaze {
diff --git a/blaze/math/sparse/ValueIndexPair.h b/blaze/math/sparse/ValueIndexPair.h
index c4235c46..d24de95e 100644
--- a/blaze/math/sparse/ValueIndexPair.h
+++ b/blaze/math/sparse/ValueIndexPair.h
@@ -48,6 +48,7 @@
 #include <blaze/util/constraints/Volatile.h>
 #include <blaze/util/DisableIf.h>
 #include <blaze/util/EnableIf.h>
+#include <blaze/util/Types.h>
 
 
 namespace blaze {
diff --git a/blaze/math/typetraits/Columns.h b/blaze/math/typetraits/Columns.h
index 30cbd824..5faab8f9 100644
--- a/blaze/math/typetraits/Columns.h
+++ b/blaze/math/typetraits/Columns.h
@@ -36,6 +36,13 @@
 #define _BLAZE_MATH_TYPETRAITS_COLUMNS_H_
 
 
+//*************************************************************************************************
+// Includes
+//*************************************************************************************************
+
+#include <blaze/util/Types.h>
+
+
 namespace blaze {
 
 //=================================================================================================
@@ -57,7 +64,7 @@ namespace blaze {
    using blaze::StaticMatrix;
    using blaze::HybridMatrix;
    using blaze::DynamicMatrix;
-   
+
    blaze::Columns< StaticMatrix<int,3UL,2UL> >::value  // Evaluates to 2
    blaze::Columns< HybridMatrix<int,3UL,2UL> >::value  // Evaluates to 0; Only maximum number of columns is fixed!
    blaze::Columns< DynamicMatrix<int> >::value         // Evaluates to 0; Number of columns not fixed at compile time!
diff --git a/blaze/math/typetraits/Rows.h b/blaze/math/typetraits/Rows.h
index b0e0d527..8390c0f5 100644
--- a/blaze/math/typetraits/Rows.h
+++ b/blaze/math/typetraits/Rows.h
@@ -36,6 +36,13 @@
 #define _BLAZE_MATH_TYPETRAITS_ROWS_H_
 
 
+//*************************************************************************************************
+// Includes
+//*************************************************************************************************
+
+#include <blaze/util/Types.h>
+
+
 namespace blaze {
 
 //=================================================================================================
@@ -57,7 +64,7 @@ namespace blaze {
    using blaze::StaticMatrix;
    using blaze::HybridMatrix;
    using blaze::DynamicMatrix;
-   
+
    blaze::Rows< StaticMatrix<int,3UL,2UL> >::value  // Evaluates to 3
    blaze::Rows< HybridMatrix<int,3UL,2UL> >::value  // Evaluates to 0; Only maximum number of rows is fixed!
    blaze::Rows< DynamicMatrix<int> >::value         // Evaluates to 0; Number of rows not fixed at compile time!
diff --git a/blaze/math/typetraits/Size.h b/blaze/math/typetraits/Size.h
index 511f7b76..338c82f8 100644
--- a/blaze/math/typetraits/Size.h
+++ b/blaze/math/typetraits/Size.h
@@ -36,6 +36,13 @@
 #define _BLAZE_MATH_TYPETRAITS_SIZE_H_
 
 
+//*************************************************************************************************
+// Includes
+//*************************************************************************************************
+
+#include <blaze/util/Types.h>
+
+
 namespace blaze {
 
 //=================================================================================================
@@ -56,7 +63,7 @@ namespace blaze {
    using blaze::StaticVector;
    using blaze::HybridVector;
    using blaze::DynamicVector;
-   
+
    blaze::Size< StaticVector<int,3UL> >::value  // Evaluates to 3
    blaze::Size< HybridVector<int,3UL> >::value  // Evaluates to 0; Only maximum size is fixed!
    blaze::Size< DynamicVector<int> >::value     // Evaluates to 0; Size not fixed at compile time!