diff options
author | Gael Guennebaud <g.gael@free.fr> | 2013-04-10 17:30:25 +0200 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2013-04-10 17:30:25 +0200 |
commit | 1e38928c6458c06c5554898e5e201c0f4e721b2a (patch) | |
tree | 4215a27952122583b6ca135fd363725197234a77 /Eigen | |
parent | ff661a7b6f0c16a079cfb5cb2c3b371e2bf6e42a (diff) |
workaround strange compilation issue with ICC and -strict-ansi
Diffstat (limited to 'Eigen')
-rw-r--r-- | Eigen/src/OrderingMethods/Eigen_Colamd.h | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/Eigen/src/OrderingMethods/Eigen_Colamd.h b/Eigen/src/OrderingMethods/Eigen_Colamd.h index 6075c5aa5..44548f660 100644 --- a/Eigen/src/OrderingMethods/Eigen_Colamd.h +++ b/Eigen/src/OrderingMethods/Eigen_Colamd.h @@ -436,7 +436,7 @@ static bool colamd(Index n_row, Index n_col, Index Alen, Index *A, Index *p, dou /* === Construct the row and column data structures ===================== */ - if (!init_rows_cols (n_row, n_col, Row, Col, A, p, stats)) + if (!Eigen::internal::init_rows_cols (n_row, n_col, Row, Col, A, p, stats)) { /* input matrix is invalid */ COLAMD_DEBUG0 (("colamd: Matrix invalid\n")) ; @@ -445,17 +445,17 @@ static bool colamd(Index n_row, Index n_col, Index Alen, Index *A, Index *p, dou /* === Initialize scores, kill dense rows/columns ======================= */ - init_scoring (n_row, n_col, Row, Col, A, p, knobs, + Eigen::internal::init_scoring (n_row, n_col, Row, Col, A, p, knobs, &n_row2, &n_col2, &max_deg) ; /* === Order the supercolumns =========================================== */ - ngarbage = find_ordering (n_row, n_col, Alen, Row, Col, A, p, + ngarbage = Eigen::internal::find_ordering (n_row, n_col, Alen, Row, Col, A, p, n_col2, max_deg, 2*nnz) ; /* === Order the non-principal columns ================================== */ - order_children (n_col, Col, p) ; + Eigen::internal::order_children (n_col, Col, p) ; /* === Return statistics in stats ======================================= */ @@ -993,7 +993,7 @@ static Index find_ordering /* return the number of garbage collections */ /* === Initialization and clear mark ==================================== */ max_mark = INT_MAX - n_col ; /* INT_MAX defined in <limits.h> */ - tag_mark = clear_mark (n_row, Row) ; + tag_mark = Eigen::internal::clear_mark (n_row, Row) ; min_score = 0 ; ngarbage = 0 ; COLAMD_DEBUG1 (("colamd: Ordering, n_col2=%d\n", n_col2)) ; @@ -1043,12 +1043,12 @@ static Index find_ordering /* return the number of garbage collections */ needed_memory = COLAMD_MIN (pivot_col_score, n_col - k) ; if (pfree + needed_memory >= Alen) { - pfree = garbage_collection (n_row, n_col, Row, Col, A, &A [pfree]) ; + pfree = Eigen::internal::garbage_collection (n_row, n_col, Row, Col, A, &A [pfree]) ; ngarbage++ ; /* after garbage collection we will have enough */ COLAMD_ASSERT (pfree + needed_memory < Alen) ; /* garbage collection has wiped out the Row[].shared2.mark array */ - tag_mark = clear_mark (n_row, Row) ; + tag_mark = Eigen::internal::clear_mark (n_row, Row) ; } @@ -1336,9 +1336,7 @@ static Index find_ordering /* return the number of garbage collections */ COLAMD_DEBUG3 (("** Supercolumn detection phase. **\n")) ; - detect_super_cols ( - - Col, A, head, pivot_row_start, pivot_row_length) ; + Eigen::internal::detect_super_cols (Col, A, head, pivot_row_start, pivot_row_length) ; /* === Kill the pivotal column ====================================== */ @@ -1350,7 +1348,7 @@ static Index find_ordering /* return the number of garbage collections */ if (tag_mark >= max_mark) { COLAMD_DEBUG2 (("clearing tag_mark\n")) ; - tag_mark = clear_mark (n_row, Row) ; + tag_mark = Eigen::internal::clear_mark (n_row, Row) ; } /* === Finalize the new pivot row, and column scores ================ */ |