Get rid of include directives inside namespace blocks (bug #339).

Eigen/src/SparseCore/AmbiVector.h

@@ -25,6 +25,8 @@
 #ifndef EIGEN_AMBIVECTOR_H
 #define EIGEN_AMBIVECTOR_H
 
+namespace Eigen { 
+
 namespace internal {
 
 /** \internal
@@ -377,6 +379,8 @@ class AmbiVector<_Scalar,_Index>::Iterator
     bool m_isDense;             // mode of the vector
 };
 
-} // namespace internal
+} // end namespace internal
+
+} // end namespace Eigen
 
 #endif // EIGEN_AMBIVECTOR_H

Eigen/src/SparseCore/CompressedStorage.h

@@ -25,6 +25,8 @@
 #ifndef EIGEN_COMPRESSED_STORAGE_H
 #define EIGEN_COMPRESSED_STORAGE_H
 
+namespace Eigen { 
+
 namespace internal {
 
 /** \internal
@@ -239,6 +241,8 @@ class CompressedStorage
 
 };
 
-} // namespace internal
+} // end namespace internal
+
+} // end namespace Eigen
 
 #endif // EIGEN_COMPRESSED_STORAGE_H

Eigen/src/SparseCore/ConservativeSparseSparseProduct.h

@@ -25,6 +25,8 @@
 #ifndef EIGEN_CONSERVATIVESPARSESPARSEPRODUCT_H
 #define EIGEN_CONSERVATIVESPARSESPARSEPRODUCT_H
 
+namespace Eigen { 
+
 namespace internal {
 
 template<typename Lhs, typename Rhs, typename ResultType>
@@ -253,5 +255,6 @@ struct conservative_sparse_sparse_product_selector<Lhs,Rhs,ResultType,RowMajor,R
 
 } // end namespace internal
 
+} // end namespace Eigen
 
 #endif // EIGEN_CONSERVATIVESPARSESPARSEPRODUCT_H

Eigen/src/SparseCore/CoreIterators.h

@@ -25,6 +25,8 @@
 #ifndef EIGEN_COREITERATORS_H
 #define EIGEN_COREITERATORS_H
 
+namespace Eigen { 
+
 /* This file contains the respective InnerIterator definition of the expressions defined in Eigen/Core
  */
 
@@ -69,4 +71,6 @@ template<typename Derived> class DenseBase<Derived>::InnerIterator
     const Index m_end;
 };
 
+} // end namespace Eigen
+
 #endif // EIGEN_COREITERATORS_H

Eigen/src/SparseCore/MappedSparseMatrix.h

@@ -25,6 +25,8 @@
 #ifndef EIGEN_MAPPED_SPARSEMATRIX_H
 #define EIGEN_MAPPED_SPARSEMATRIX_H
 
+namespace Eigen { 
+
 /** \class MappedSparseMatrix
   *
   * \brief Sparse matrix
@@ -187,4 +189,6 @@ class MappedSparseMatrix<Scalar,_Flags,_Index>::ReverseInnerIterator
     const Index m_end;
 };
 
+} // end namespace Eigen
+
 #endif // EIGEN_MAPPED_SPARSEMATRIX_H

Eigen/src/SparseCore/SparseBlock.h

@@ -25,6 +25,8 @@
 #ifndef EIGEN_SPARSE_BLOCK_H
 #define EIGEN_SPARSE_BLOCK_H
 
+namespace Eigen { 
+
 namespace internal {
 template<typename MatrixType, int Size>
 struct traits<SparseInnerVectorSet<MatrixType, Size> >
@@ -395,4 +397,6 @@ template<typename Derived>
 const SparseInnerVectorSet<Derived,Dynamic> SparseMatrixBase<Derived>::innerVectors(Index outerStart, Index outerSize) const
 { return SparseInnerVectorSet<Derived,Dynamic>(derived(), outerStart, outerSize); }
 
+} // end namespace Eigen
+
 #endif // EIGEN_SPARSE_BLOCK_H

Eigen/src/SparseCore/SparseCwiseBinaryOp.h

@@ -25,6 +25,8 @@
 #ifndef EIGEN_SPARSE_CWISE_BINARY_OP_H
 #define EIGEN_SPARSE_CWISE_BINARY_OP_H
 
+namespace Eigen { 
+
 // Here we have to handle 3 cases:
 //  1 - sparse op dense
 //  2 - dense op sparse
@@ -332,4 +334,6 @@ SparseMatrixBase<Derived>::cwiseProduct(const MatrixBase<OtherDerived> &other) c
   return EIGEN_SPARSE_CWISE_PRODUCT_RETURN_TYPE(derived(), other.derived());
 }
 
+} // end namespace Eigen
+
 #endif // EIGEN_SPARSE_CWISE_BINARY_OP_H

Eigen/src/SparseCore/SparseCwiseUnaryOp.h

@@ -25,6 +25,8 @@
 #ifndef EIGEN_SPARSE_CWISE_UNARY_OP_H
 #define EIGEN_SPARSE_CWISE_UNARY_OP_H
 
+namespace Eigen { 
+
 template<typename UnaryOp, typename MatrixType>
 class CwiseUnaryOpImpl<UnaryOp,MatrixType,Sparse>
   : public SparseMatrixBase<CwiseUnaryOp<UnaryOp, MatrixType> >
@@ -171,4 +173,6 @@ SparseMatrixBase<Derived>::operator/=(const Scalar& other)
   return derived();
 }
 
+} // end namespace Eigen
+
 #endif // EIGEN_SPARSE_CWISE_UNARY_OP_H

Eigen/src/SparseCore/SparseDenseProduct.h

@@ -25,6 +25,8 @@
 #ifndef EIGEN_SPARSEDENSEPRODUCT_H
 #define EIGEN_SPARSEDENSEPRODUCT_H
 
+namespace Eigen { 
+
 template<typename Lhs, typename Rhs, int InnerSize> struct SparseDenseProductReturnType
 {
   typedef SparseTimeDenseProduct<Lhs,Rhs> Type;
@@ -308,4 +310,6 @@ SparseMatrixBase<Derived>::operator*(const MatrixBase<OtherDerived> &other) cons
   return typename SparseDenseProductReturnType<Derived,OtherDerived>::Type(derived(), other.derived());
 }
 
+} // end namespace Eigen
+
 #endif // EIGEN_SPARSEDENSEPRODUCT_H

Eigen/src/SparseCore/SparseDiagonalProduct.h

@@ -25,6 +25,8 @@
 #ifndef EIGEN_SPARSE_DIAGONAL_PRODUCT_H
 #define EIGEN_SPARSE_DIAGONAL_PRODUCT_H
 
+namespace Eigen { 
+
 // The product of a diagonal matrix with a sparse matrix can be easily
 // implemented using expression template.
 // We have two consider very different cases:
@@ -192,4 +194,6 @@ SparseMatrixBase<Derived>::operator*(const DiagonalBase<OtherDerived> &other) co
   return SparseDiagonalProduct<Derived,OtherDerived>(this->derived(), other.derived());
 }
 
+} // end namespace Eigen
+
 #endif // EIGEN_SPARSE_DIAGONAL_PRODUCT_H

Eigen/src/SparseCore/SparseDot.h

@@ -25,6 +25,8 @@
 #ifndef EIGEN_SPARSE_DOT_H
 #define EIGEN_SPARSE_DOT_H
 
+namespace Eigen { 
+
 template<typename Derived>
 template<typename OtherDerived>
 typename internal::traits<Derived>::Scalar
@@ -102,4 +104,6 @@ SparseMatrixBase<Derived>::norm() const
   return internal::sqrt(squaredNorm());
 }
 
+} // end namespace Eigen
+
 #endif // EIGEN_SPARSE_DOT_H

Eigen/src/SparseCore/SparseMatrix.h

@@ -25,6 +25,8 @@
 #ifndef EIGEN_SPARSEMATRIX_H
 #define EIGEN_SPARSEMATRIX_H
 
+namespace Eigen { 
+
 /** \ingroup SparseCore_Module
   *
   * \class SparseMatrix
@@ -1120,4 +1122,6 @@ void SparseMatrix<Scalar,_Options,_Index>::sumupDuplicates()
   m_data.resize(m_outerIndex[m_outerSize]);
 }
 
+} // end namespace Eigen
+
 #endif // EIGEN_SPARSEMATRIX_H

Eigen/src/SparseCore/SparseMatrixBase.h

@@ -25,6 +25,8 @@
 #ifndef EIGEN_SPARSEMATRIXBASE_H
 #define EIGEN_SPARSEMATRIXBASE_H
 
+namespace Eigen { 
+
 /** \ingroup SparseCore_Module
   *
   * \class SparseMatrixBase
@@ -466,4 +468,6 @@ template<typename Derived> class SparseMatrixBase : public EigenBase<Derived>
     bool m_isRValue;
 };
 
+} // end namespace Eigen
+
 #endif // EIGEN_SPARSEMATRIXBASE_H

Eigen/src/SparseCore/SparsePermutation.h

@@ -27,6 +27,8 @@
 
 // This file implements sparse * permutation products
 
+namespace Eigen { 
+
 namespace internal {
 
 template<typename PermutationType, typename MatrixType, int Side, bool Transposed>
@@ -156,5 +158,6 @@ operator*(const Transpose<PermutationBase<PermDerived> >& tperm, const SparseMat
   return internal::permut_sparsematrix_product_retval<PermutationBase<PermDerived>, SparseDerived, OnTheLeft, true>(tperm.nestedPermutation(), matrix.derived());
 }
 
+} // end namespace Eigen
 
 #endif // EIGEN_SPARSE_SELFADJOINTVIEW_H

Eigen/src/SparseCore/SparseProduct.h

@@ -25,6 +25,8 @@
 #ifndef EIGEN_SPARSEPRODUCT_H
 #define EIGEN_SPARSEPRODUCT_H
 
+namespace Eigen { 
+
 template<typename Lhs, typename Rhs>
 struct SparseSparseProductReturnType
 {
@@ -194,4 +196,6 @@ SparseMatrixBase<Derived>::operator*(const SparseMatrixBase<OtherDerived> &other
   return typename SparseSparseProductReturnType<Derived,OtherDerived>::Type(derived(), other.derived());
 }
 
+} // end namespace Eigen
+
 #endif // EIGEN_SPARSEPRODUCT_H

Eigen/src/SparseCore/SparseRedux.h

@@ -25,6 +25,8 @@
 #ifndef EIGEN_SPARSEREDUX_H
 #define EIGEN_SPARSEREDUX_H
 
+namespace Eigen { 
+
 template<typename Derived>
 typename internal::traits<Derived>::Scalar
 SparseMatrixBase<Derived>::sum() const
@@ -53,4 +55,6 @@ SparseVector<_Scalar,_Options,_Index>::sum() const
   return Matrix<Scalar,1,Dynamic>::Map(&m_data.value(0), m_data.size()).sum();
 }
 
+} // end namespace Eigen
+
 #endif // EIGEN_SPARSEREDUX_H

Eigen/src/SparseCore/SparseSelfAdjointView.h

@@ -25,6 +25,8 @@
 #ifndef EIGEN_SPARSE_SELFADJOINTVIEW_H
 #define EIGEN_SPARSE_SELFADJOINTVIEW_H
 
+namespace Eigen { 
+
 /** \ingroup SparseCore_Module
   * \class SparseSelfAdjointView
   *
@@ -488,4 +490,6 @@ class SparseSymmetricPermutationProduct
 
 };
 
+} // end namespace Eigen
+
 #endif // EIGEN_SPARSE_SELFADJOINTVIEW_H

Eigen/src/SparseCore/SparseSparseProductWithPruning.h

@@ -25,6 +25,8 @@
 #ifndef EIGEN_SPARSESPARSEPRODUCTWITHPRUNING_H
 #define EIGEN_SPARSESPARSEPRODUCTWITHPRUNING_H
 
+namespace Eigen { 
+
 namespace internal {
 
 
@@ -157,4 +159,6 @@ struct sparse_sparse_product_with_pruning_selector<Lhs,Rhs,ResultType,RowMajor,R
 
 } // end namespace internal
 
+} // end namespace Eigen
+
 #endif // EIGEN_SPARSESPARSEPRODUCTWITHPRUNING_H

Eigen/src/SparseCore/SparseTranspose.h

@@ -25,6 +25,8 @@
 #ifndef EIGEN_SPARSETRANSPOSE_H
 #define EIGEN_SPARSETRANSPOSE_H
 
+namespace Eigen { 
+
 template<typename MatrixType> class TransposeImpl<MatrixType,Sparse>
   : public SparseMatrixBase<Transpose<MatrixType> >
 {
@@ -69,4 +71,6 @@ template<typename MatrixType> class TransposeImpl<MatrixType,Sparse>::ReverseInn
     inline typename TransposeImpl<MatrixType,Sparse>::Index col() const { return Base::row(); }
 };
 
+} // end namespace Eigen
+
 #endif // EIGEN_SPARSETRANSPOSE_H

Eigen/src/SparseCore/SparseTriangularView.h

@@ -25,6 +25,8 @@
 #ifndef EIGEN_SPARSE_TRIANGULARVIEW_H
 #define EIGEN_SPARSE_TRIANGULARVIEW_H
 
+namespace Eigen { 
+
 namespace internal {
   
 template<typename MatrixType, int Mode>
@@ -172,4 +174,6 @@ SparseMatrixBase<Derived>::triangularView() const
   return derived();
 }
 
+} // end namespace Eigen
+
 #endif // EIGEN_SPARSE_TRIANGULARVIEW_H

Eigen/src/SparseCore/SparseUtil.h

@@ -25,6 +25,8 @@
 #ifndef EIGEN_SPARSEUTIL_H
 #define EIGEN_SPARSEUTIL_H
 
+namespace Eigen { 
+
 #ifdef NDEBUG
 #define EIGEN_DBG_SPARSE(X)
 #else
@@ -181,4 +183,6 @@ protected:
   Scalar m_value;
 };
 
+} // end namespace Eigen
+
 #endif // EIGEN_SPARSEUTIL_H

Eigen/src/SparseCore/SparseVector.h

@@ -25,6 +25,8 @@
 #ifndef EIGEN_SPARSEVECTOR_H
 #define EIGEN_SPARSEVECTOR_H
 
+namespace Eigen { 
+
 /** \ingroup SparseCore_Module
   * \class SparseVector
   *
@@ -406,4 +408,6 @@ class SparseVector<Scalar,_Options,_Index>::ReverseInnerIterator
     const Index m_start;
 };
 
+} // end namespace Eigen
+
 #endif // EIGEN_SPARSEVECTOR_H

Eigen/src/SparseCore/SparseView.h

@@ -26,6 +26,8 @@
 #ifndef EIGEN_SPARSEVIEW_H
 #define EIGEN_SPARSEVIEW_H
 
+namespace Eigen { 
+
 namespace internal {
 
 template<typename MatrixType>
@@ -106,4 +108,6 @@ const SparseView<Derived> MatrixBase<Derived>::sparseView(const Scalar& m_refere
   return SparseView<Derived>(derived(), m_reference, m_epsilon);
 }
 
+} // end namespace Eigen
+
 #endif

Eigen/src/SparseCore/TriangularSolver.h

@@ -25,6 +25,8 @@
 #ifndef EIGEN_SPARSETRIANGULARSOLVER_H
 #define EIGEN_SPARSETRIANGULARSOLVER_H
 
+namespace Eigen { 
+
 namespace internal {
 
 template<typename Lhs, typename Rhs, int Mode,
@@ -342,4 +344,6 @@ SparseMatrixBase<Derived>::solveTriangular(const MatrixBase<OtherDerived>& other
 }
 #endif // EIGEN2_SUPPORT
 
+} // end namespace Eigen
+
 #endif // EIGEN_SPARSETRIANGULARSOLVER_H