diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2012-04-18 10:09:46 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2012-04-18 10:09:46 +0200 |
| commit | 5cab18976bc2be4f9568777ed81db3d7ed4aba5a (patch) | |
| tree | 5ef7a2f2360730fdcb2c38539f9e3d9001640003 /unsupported/Eigen | |
| parent | 1198ca02845e34db7c1da27fb3beb96743d2d0ee (diff) | |
cleaning pass: rm unused variables in MKL stuff, fix a few namespace issues, MarketIO needs iostream
Diffstat (limited to 'unsupported/Eigen')
| -rw-r--r-- | unsupported/Eigen/SparseExtra | 2 | ||||
| -rw-r--r-- | unsupported/Eigen/src/SparseExtra/MarketIO.h | 4 | ||||
| -rw-r--r-- | unsupported/Eigen/src/SparseExtra/MatrixMarketIterator.h | 7 |
3 files changed, 9 insertions, 4 deletions
diff --git a/unsupported/Eigen/SparseExtra b/unsupported/Eigen/SparseExtra index 2cc14bbe1..340c34736 100644 --- a/unsupported/Eigen/SparseExtra +++ b/unsupported/Eigen/SparseExtra @@ -39,9 +39,7 @@ #if !defined(_WIN32) #include <dirent.h> -namespace Eigen { #include "src/SparseExtra/MatrixMarketIterator.h" -} #endif #include "../../Eigen/src/Core/util/ReenableStupidWarnings.h" diff --git a/unsupported/Eigen/src/SparseExtra/MarketIO.h b/unsupported/Eigen/src/SparseExtra/MarketIO.h index d034d8e2f..ef5dcf9f0 100644 --- a/unsupported/Eigen/src/SparseExtra/MarketIO.h +++ b/unsupported/Eigen/src/SparseExtra/MarketIO.h @@ -26,6 +26,8 @@ #ifndef EIGEN_SPARSE_MARKET_IO_H #define EIGEN_SPARSE_MARKET_IO_H +#include <iostream> + namespace Eigen { namespace internal @@ -117,7 +119,7 @@ namespace internal out << value.real << " " << value.imag()<< "\n"; } -} +} // end namepsace internal inline bool getMarketHeader(const std::string& filename, int& sym, bool& iscomplex, bool& isvector) { diff --git a/unsupported/Eigen/src/SparseExtra/MatrixMarketIterator.h b/unsupported/Eigen/src/SparseExtra/MatrixMarketIterator.h index 322780ef9..5a50bc5bc 100644 --- a/unsupported/Eigen/src/SparseExtra/MatrixMarketIterator.h +++ b/unsupported/Eigen/src/SparseExtra/MatrixMarketIterator.h @@ -2,7 +2,7 @@ // This file is part of Eigen, a lightweight C++ template library // for linear algebra. // -// Copyright (C) 2012 +// Copyright (C) 2012 Desire NUENTSA WAKAM <desire.nuentsa_wakam@inria.fr> // // Eigen is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -22,9 +22,12 @@ // You should have received a copy of the GNU Lesser General Public // License and a copy of the GNU General Public License along with // Eigen. If not, see <http://www.gnu.org/licenses/>. + #ifndef EIGEN_BROWSE_MATRICES_H #define EIGEN_BROWSE_MATRICES_H +namespace Eigen { + enum { SPD = 0x100, NonSymmetric = 0x0 @@ -227,4 +230,6 @@ class MatrixMarketIterator }; +} // end namespace Eigen + #endif |