diff options
| author | txh18 <cloudygooseg@gmail.com> | 2015-12-10 22:31:10 +0800 |
|---|---|---|
| committer | txh18 <cloudygooseg@gmail.com> | 2015-12-10 22:31:10 +0800 |
| commit | 217c7f5b5c5193cfc7db20b2ee25fc66c54569b6 (patch) | |
| tree | 39d9237cd3a53cd5072cea42fc19f8b1dec2e209 /nerv/lib/matrix/generic/cumatrix.c | |
| parent | 5cf7e88df3aa4cf60819e955f0f537d2cfeccaac (diff) | |
| parent | 1b0f2ab768e34f126ce946e1689cd47c86f41645 (diff) | |
merge conflict resolve
Diffstat (limited to 'nerv/lib/matrix/generic/cumatrix.c')
| -rw-r--r-- | nerv/lib/matrix/generic/cumatrix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nerv/lib/matrix/generic/cumatrix.c b/nerv/lib/matrix/generic/cumatrix.c index 65e0788..68889ad 100644 --- a/nerv/lib/matrix/generic/cumatrix.c +++ b/nerv/lib/matrix/generic/cumatrix.c @@ -349,7 +349,7 @@ void nerv_matrix_(copy_rows_fromh_by_idx)(Matrix *a, const Matrix *b, long nrow = a->nrow; if (!(0 <= b_begin && b_begin + nrow <= idx->ncol)) NERV_EXIT_STATUS(status, MAT_INVALID_COPY_INTERVAL, 0); - float *idx_ptr = idx->data.f; + float *idx_ptr = MATRIX_ELEM_PTR_F(idx); int i; if (idx->nrow != 1) NERV_EXIT_STATUS(status, MAT_IDX_VECTOR_EXP, 0); |