From 54b23cce1661b17e166f07d16169fde76d8d7aa0 Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Fri, 23 Oct 2015 10:36:33 +0200 Subject: [PATCH 1/3] Switch to MPL2 --- test/metis_support.cpp | 22 ++++------------------ test/sparselu.cpp | 22 +++------------------- 2 files changed, 7 insertions(+), 37 deletions(-) diff --git a/test/metis_support.cpp b/test/metis_support.cpp index 932b04074..d87c56a13 100644 --- a/test/metis_support.cpp +++ b/test/metis_support.cpp @@ -3,24 +3,10 @@ // // Copyright (C) 2012 Désiré Nuentsa-Wakam // -// 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 . +// 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/. + #include "sparse_solver.h" #include #include diff --git a/test/sparselu.cpp b/test/sparselu.cpp index 78615ff3b..bd000baf1 100644 --- a/test/sparselu.cpp +++ b/test/sparselu.cpp @@ -3,25 +3,9 @@ // // Copyright (C) 2012 Désiré Nuentsa-Wakam // -// 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 . - +// 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/. // SparseLU solve does not accept column major matrices for the destination. // However, as expected, the generic check_sparse_square_solving routines produces row-major From 0905ed539065adbe41e063313712518403458509 Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Fri, 23 Oct 2015 14:41:25 +0200 Subject: [PATCH 2/3] remove useless cstdint header --- unsupported/test/mpreal/mpreal.h | 1 - 1 file changed, 1 deletion(-) diff --git a/unsupported/test/mpreal/mpreal.h b/unsupported/test/mpreal/mpreal.h index 7d14c0961..c4f6cf0cb 100644 --- a/unsupported/test/mpreal/mpreal.h +++ b/unsupported/test/mpreal/mpreal.h @@ -56,7 +56,6 @@ #include #include #include -#include #include #include From c244081490d86f0156cee4f0d05873897afcbf21 Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Fri, 23 Oct 2015 14:48:54 +0200 Subject: [PATCH 3/3] disable usage of INTMAX_T --- unsupported/test/mpreal/mpreal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unsupported/test/mpreal/mpreal.h b/unsupported/test/mpreal/mpreal.h index c4f6cf0cb..9b96ec411 100644 --- a/unsupported/test/mpreal/mpreal.h +++ b/unsupported/test/mpreal/mpreal.h @@ -107,7 +107,7 @@ #define MPREAL_HAVE_EXPLICIT_CONVERTERS #endif -#define MPFR_USE_INTMAX_T // Enable 64-bit integer types - should be defined before mpfr.h +//#define MPFR_USE_INTMAX_T // Enable 64-bit integer types - should be defined before mpfr.h #if defined(MPREAL_HAVE_MSVC_DEBUGVIEW) && defined(_MSC_VER) && defined(_DEBUG) #define MPREAL_MSVC_DEBUGVIEW_CODE DebugView = toString();