Mercurial > mxe-octave
annotate src/of-sparsersb-1-fixes.patch @ 4324:a0f108ead0dc
* src/of-sparsersb-1-fixes.patch: New file.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sat, 07 Jan 2017 12:25:13 -0500 |
parents | |
children |
rev | line source |
---|---|
4324
a0f108ead0dc
* src/of-sparsersb-1-fixes.patch: New file.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1 diff -ur a/src/sparsersb.cc b/src/sparsersb.cc |
a0f108ead0dc
* src/of-sparsersb-1-fixes.patch: New file.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2 --- a/src/sparsersb.cc 2016-10-02 15:08:13.000000000 -0400 |
a0f108ead0dc
* src/of-sparsersb-1-fixes.patch: New file.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
3 +++ b/src/sparsersb.cc 2017-01-07 12:20:04.317822121 -0500 |
a0f108ead0dc
* src/of-sparsersb-1-fixes.patch: New file.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
4 @@ -74,7 +74,6 @@ |
a0f108ead0dc
* src/of-sparsersb-1-fixes.patch: New file.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
5 #include <octave/ov-complex.h> |
a0f108ead0dc
* src/of-sparsersb-1-fixes.patch: New file.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
6 #include <octave/ops.h> |
a0f108ead0dc
* src/of-sparsersb-1-fixes.patch: New file.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
7 #include <octave/ov-typeinfo.h> |
a0f108ead0dc
* src/of-sparsersb-1-fixes.patch: New file.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
8 -#include <octave/oct-alloc.h> /* DECLARE_OCTAVE_ALLOCATOR */ |
a0f108ead0dc
* src/of-sparsersb-1-fixes.patch: New file.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
9 #if RSBOI_WANT_PRINT_PCT_OCTAVE_STYLE |
a0f108ead0dc
* src/of-sparsersb-1-fixes.patch: New file.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
10 #include <iomanip> // std::setprecision |
a0f108ead0dc
* src/of-sparsersb-1-fixes.patch: New file.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
11 #endif |
a0f108ead0dc
* src/of-sparsersb-1-fixes.patch: New file.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
12 @@ -1373,9 +1372,6 @@ |
a0f108ead0dc
* src/of-sparsersb-1-fixes.patch: New file.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
13 |
a0f108ead0dc
* src/of-sparsersb-1-fixes.patch: New file.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
14 private: |
a0f108ead0dc
* src/of-sparsersb-1-fixes.patch: New file.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
15 public: |
a0f108ead0dc
* src/of-sparsersb-1-fixes.patch: New file.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
16 -#if !RSBOI_USE_PATCH_38143 |
a0f108ead0dc
* src/of-sparsersb-1-fixes.patch: New file.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
17 - DECLARE_OCTAVE_ALLOCATOR |
a0f108ead0dc
* src/of-sparsersb-1-fixes.patch: New file.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
18 -#endif /* RSBOI_USE_PATCH_38143 */ |
a0f108ead0dc
* src/of-sparsersb-1-fixes.patch: New file.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
19 DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA |
a0f108ead0dc
* src/of-sparsersb-1-fixes.patch: New file.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
20 };/* end of class octave_sparsersb_mtx definition */ |
a0f108ead0dc
* src/of-sparsersb-1-fixes.patch: New file.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
21 |
a0f108ead0dc
* src/of-sparsersb-1-fixes.patch: New file.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
22 @@ -1415,7 +1411,6 @@ |
a0f108ead0dc
* src/of-sparsersb-1-fixes.patch: New file.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
23 return new octave_sparse_complex_matrix (v.sparse_complex_matrix_value()); |
a0f108ead0dc
* src/of-sparsersb-1-fixes.patch: New file.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
24 } |
a0f108ead0dc
* src/of-sparsersb-1-fixes.patch: New file.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
25 |
a0f108ead0dc
* src/of-sparsersb-1-fixes.patch: New file.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
26 -DEFINE_OCTAVE_ALLOCATOR (octave_sparsersb_mtx) |
a0f108ead0dc
* src/of-sparsersb-1-fixes.patch: New file.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
27 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_sparsersb_mtx, |
a0f108ead0dc
* src/of-sparsersb-1-fixes.patch: New file.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
28 RSB_OI_TYPEINFO_STRING, |
a0f108ead0dc
* src/of-sparsersb-1-fixes.patch: New file.
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
29 RSB_OI_TYPEINFO_TYPE) |