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 /unsupported | |
| parent | 14e2ab02b58ba07e2be6b003bc178a0ec5e1015b (diff) | |
Fix some MPL2/LGPL lisencing confusions
Diffstat (limited to 'unsupported')
| -rw-r--r-- | unsupported/Eigen/IterativeSolvers | 3 | ||||
| -rw-r--r-- | unsupported/Eigen/src/IterativeSolvers/ConstrainedConjGrad.h | 4 | ||||
| -rw-r--r-- | unsupported/Eigen/src/IterativeSolvers/IterationController.h | 4 |
3 files changed, 3 insertions, 8 deletions
diff --git a/unsupported/Eigen/IterativeSolvers b/unsupported/Eigen/IterativeSolvers index 04341b22e..aa15403db 100644 --- a/unsupported/Eigen/IterativeSolvers +++ b/unsupported/Eigen/IterativeSolvers @@ -27,8 +27,11 @@ #include "../../Eigen/src/misc/Solve.h" #include "../../Eigen/src/misc/SparseSolve.h" +#ifndef EIGEN_MPL2_ONLY #include "src/IterativeSolvers/IterationController.h" #include "src/IterativeSolvers/ConstrainedConjGrad.h" +#endif + #include "src/IterativeSolvers/IncompleteLU.h" #include "../../Eigen/Jacobi" #include "../../Eigen/Householder" diff --git a/unsupported/Eigen/src/IterativeSolvers/ConstrainedConjGrad.h b/unsupported/Eigen/src/IterativeSolvers/ConstrainedConjGrad.h index b83bf7aef..3f18beeeb 100644 --- a/unsupported/Eigen/src/IterativeSolvers/ConstrainedConjGrad.h +++ b/unsupported/Eigen/src/IterativeSolvers/ConstrainedConjGrad.h @@ -2,10 +2,6 @@ // for linear algebra. // // Copyright (C) 2008 Gael Guennebaud <gael.guennebaud@inria.fr> -// -// 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/. /* NOTE The functions of this file have been adapted from the GMM++ library */ diff --git a/unsupported/Eigen/src/IterativeSolvers/IterationController.h b/unsupported/Eigen/src/IterativeSolvers/IterationController.h index ea86dfef4..c9c1a4be2 100644 --- a/unsupported/Eigen/src/IterativeSolvers/IterationController.h +++ b/unsupported/Eigen/src/IterativeSolvers/IterationController.h @@ -2,10 +2,6 @@ // for linear algebra. // // Copyright (C) 2008-2009 Gael Guennebaud <gael.guennebaud@inria.fr> -// -// 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/. /* NOTE The class IterationController has been adapted from the iteration * class of the GMM++ and ITL libraries. |