From bb51d9f4fa3cf1114348b9180640d6da7d3964f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20S=C3=A1nchez?= Date: Sat, 9 Jul 2022 04:56:36 +0000 Subject: [PATCH] Fix ODR violations. --- Eigen/src/SparseLU/SparseLU_Structs.h | 4 ++-- unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Eigen/src/SparseLU/SparseLU_Structs.h b/Eigen/src/SparseLU/SparseLU_Structs.h index 74c6561247..3ab0c72bf3 100644 --- a/Eigen/src/SparseLU/SparseLU_Structs.h +++ b/Eigen/src/SparseLU/SparseLU_Structs.h @@ -72,8 +72,8 @@ namespace Eigen { namespace internal { - -typedef enum {LUSUP, UCOL, LSUB, USUB, LLVL, ULVL} MemType; + +enum MemType {LUSUP, UCOL, LSUB, USUB, LLVL, ULVL}; template struct LU_GlobalLU_t { diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h b/unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h index 295f6e5bbb..8c705ecf6d 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h @@ -256,10 +256,10 @@ struct nested > // the SAME case. // When the stride is 1, we have the simplified case R'=R-K+1, C'=C-K+1, Pr=0, // Pc=0. -typedef enum { +enum PaddingType { PADDING_VALID = 1, PADDING_SAME = 2 -} PaddingType; +}; } // end namespace Eigen