diff options
author | Gael Guennebaud <g.gael@free.fr> | 2013-02-06 11:30:33 +0100 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2013-02-06 11:30:33 +0100 |
commit | 51542539330435fba70c483f7bf8a76001b0f5b9 (patch) | |
tree | 301546ba19f43f02f3e43d7d0f26c28380fda18d /Eigen/src/OrderingMethods/Ordering.h | |
parent | 14e2ab02b58ba07e2be6b003bc178a0ec5e1015b (diff) |
Fix some MPL2/LGPL lisencing confusions
Diffstat (limited to 'Eigen/src/OrderingMethods/Ordering.h')
-rw-r--r-- | Eigen/src/OrderingMethods/Ordering.h | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/Eigen/src/OrderingMethods/Ordering.h b/Eigen/src/OrderingMethods/Ordering.h index 2471316b9..fb1da1fe2 100644 --- a/Eigen/src/OrderingMethods/Ordering.h +++ b/Eigen/src/OrderingMethods/Ordering.h @@ -4,29 +4,13 @@ // // Copyright (C) 2012 Désiré 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 -// 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 -// the License, or (at your option) any later version. -// -// Eigen is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -// 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 -// License and a copy of the GNU General Public License along with -// Eigen. If not, see <http://www.gnu.org/licenses/>. +// This Source Code Form is subject to the terms of the Mozilla +// Public License v. 2.0. If a copy of the MPL was not distributed +// with this file, You can obtain one at http://mozilla.org/MPL/2.0/. #ifndef EIGEN_ORDERING_H #define EIGEN_ORDERING_H -#include "Amd.h" namespace Eigen { #include "Eigen_Colamd.h" @@ -53,6 +37,8 @@ void ordering_helper_at_plus_a(const MatrixType& mat, MatrixType& symmat) } +#ifndef EIGEN_MPL2_ONLY + /** \ingroup OrderingMethods_Module * \class AMDOrdering * @@ -94,6 +80,8 @@ class AMDOrdering } }; +#endif // EIGEN_MPL2_ONLY + /** \ingroup OrderingMethods_Module * \class NaturalOrdering * |