diff options
author | Gael Guennebaud <g.gael@free.fr> | 2008-12-12 12:54:45 +0000 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2008-12-12 12:54:45 +0000 |
commit | 1ed17b037db20ebe8eed954d4fa975b9e0ac82f6 (patch) | |
tree | 672b08ede4939d2abbe7172d50145fd8428059e6 /Eigen/src/Core/IO.h | |
parent | 5015e483613490ae65433e8eeae00dc176aeedf3 (diff) |
* fix a couple of warnings (patch from Armin Berres)
* allow Map to map null data
Diffstat (limited to 'Eigen/src/Core/IO.h')
-rw-r--r-- | Eigen/src/Core/IO.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Eigen/src/Core/IO.h b/Eigen/src/Core/IO.h index b7d4c9eac..6e6d02ad4 100644 --- a/Eigen/src/Core/IO.h +++ b/Eigen/src/Core/IO.h @@ -6,12 +6,12 @@ // // Eigen is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either +// License as published by the Free Software Foundation; either // version 3 of the License, or (at your option) any later version. // // Alternatively, you can redistribute it and/or // modify it under the terms of the GNU General Public License as -// published by the Free Software Foundation; either version 2 of +// published by the Free Software Foundation; either version 2 of // the License, or (at your option) any later version. // // Eigen is distributed in the hope that it will be useful, but WITHOUT ANY @@ -19,7 +19,7 @@ // FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License or the // GNU General Public License for more details. // -// You should have received a copy of the GNU Lesser General Public +// 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/>. @@ -58,7 +58,7 @@ struct IOFormat coeffSeparator(_coeffSeparator), precision(_precision), flags(_flags) { rowSpacer = ""; - int i=matSuffix.length()-1; + int i = int(matSuffix.length())-1; while (i>=0 && matSuffix[i]!='\n') { rowSpacer += ' '; @@ -81,7 +81,7 @@ struct IOFormat * This class represents an expression with stream operators controlled by a given IOFormat. * It is the return type of MatrixBase::format() * and most of the time this is the only way it is used. - * + * * See class IOFormat for some examples. * * \sa MatrixBase::format(), class IOFormat @@ -135,7 +135,7 @@ std::ostream & ei_print_matrix(std::ostream & s, const MatrixBase<Derived> & _m, std::stringstream sstr; sstr.precision(fmt.precision); sstr << m.coeff(i,j); - width = std::max<int>(width, sstr.str().length()); + width = std::max<int>(width, int(sstr.str().length())); } } s.precision(fmt.precision); |