diff options
| author |  Anshul Jaiswal <ajaiswal@fb.com> | 2019-06-08 21:09:06 +0000 |
|---|---|---|
| committer | Anshul Jaiswal <ajaiswal@fb.com> | 2019-06-08 21:09:06 +0000 |
| commit | fab51d133e6143527e5e8ea26004da5dac0586b9 (patch) | |
| tree | 33ff1a0102bf5ba89aa05170075db42a97982a86 /Eigen/src/OrderingMethods | |
| parent | 79c402e40e80b670eb6bbaae631d0a5694d720b8 (diff) | |
Updated Eigen_Colamd.h, namespacing macros ALIVE & DEAD as COLAMD_ALIVE & COLAMD_DEAD
to prevent conflicts with other libraries / code.
Diffstat (limited to 'Eigen/src/OrderingMethods')
| -rw-r--r-- | Eigen/src/OrderingMethods/Eigen_Colamd.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Eigen/src/OrderingMethods/Eigen_Colamd.h b/Eigen/src/OrderingMethods/Eigen_Colamd.h index 67fcad3f7..2a4338393 100644 --- a/Eigen/src/OrderingMethods/Eigen_Colamd.h +++ b/Eigen/src/OrderingMethods/Eigen_Colamd.h @@ -105,8 +105,8 @@ namespace internal { #define COLAMD_EMPTY (-1) /* Row and column status */ -#define ALIVE (0) -#define DEAD (-1) +#define COLAMD_ALIVE (0) +#define COLAMD_DEAD (-1) /* Column status */ #define DEAD_PRINCIPAL (-1) @@ -114,12 +114,12 @@ namespace internal { /* Macros for row and column status update and checking. */ #define ROW_IS_DEAD(r) ROW_IS_MARKED_DEAD (Row[r].shared2.mark) -#define ROW_IS_MARKED_DEAD(row_mark) (row_mark < ALIVE) -#define ROW_IS_ALIVE(r) (Row [r].shared2.mark >= ALIVE) -#define COL_IS_DEAD(c) (Col [c].start < ALIVE) -#define COL_IS_ALIVE(c) (Col [c].start >= ALIVE) +#define ROW_IS_MARKED_DEAD(row_mark) (row_mark < COLAMD_ALIVE) +#define ROW_IS_ALIVE(r) (Row [r].shared2.mark >= COLAMD_ALIVE) +#define COL_IS_DEAD(c) (Col [c].start < COLAMD_ALIVE) +#define COL_IS_ALIVE(c) (Col [c].start >= COLAMD_ALIVE) #define COL_IS_DEAD_PRINCIPAL(c) (Col [c].start == DEAD_PRINCIPAL) -#define KILL_ROW(r) { Row [r].shared2.mark = DEAD ; } +#define KILL_ROW(r) { Row [r].shared2.mark = COLAMD_DEAD ; } #define KILL_PRINCIPAL_COL(c) { Col [c].start = DEAD_PRINCIPAL ; } #define KILL_NON_PRINCIPAL_COL(c) { Col [c].start = DEAD_NON_PRINCIPAL ; } |