Mercurial > octave
annotate libinterp/octave-value/ov-bool.cc @ 21573:f3f8e1d3e399 stable
avoid mulitple definitions of static function-scope vars (bug #47372)
Some systems (Windows, others?) may generate multiple definitions of
function-scope static variables if those functions appear in header
files. This can cause trouble in various ways. Attempt to avoid the
problem by moving functions that contain file-scope varaibles from
header files to source files, or by using class-scope static variables
instead. Also attempt to avoid similar problems caused by implicit
instantiations of templates that have functions with static variables.
* Cell.h, Cell.cc (Cell::resize_fill_value):
Move definition from header to source file.
* oct-map.h, oct-map.cc (octave_fields::nil_rep): Likewise.
* ov-base-scalar.h, ov-base-scalar.cc (octave_base_scalar<ST>::dims):
Likewise.
* ov-fcn-handle.h, ov-fcn-handle.cc (octave_fcn_handle::dims): Likewise.
* ov.h, ov.cc (octave_value::nil_rep): Likewise.
* Array.h, Array.cc (Array<T>::nil_rep): Likewise.
* DiagArray2.h, DiagArray2.cc (DiagArray2<T>::elem,
DiagArray2<T>::checkelem): Likewise.
* Sparse.h, Sparse.cc (Sparse<T>::nil_rep): Likewise.
* dim-vector.h, dim-vector.cc (dim_vector::nil_rep): Likewise.
* idx-vector.h, idx-vector.cc (idx_vector::nil_rep,
idx_vector::err_rep): Likewise.
* oct-inttypes.h, oct-inttypes.cc (octave_int_base<T>::convert_real):
Likewise.
* symtab.h, symtab.cc (octave_value symbol_table::dummy_octave_value,
symbol_table::symbol_record symbol_table::dummy_symbol_record): New
class-scope static variables. Use them to eliminate function-scope
static variables.
* ov-int8.cc, ov-int16.cc, ov-int32.cc, ov-int64.cc, ov-uint8.cc,
ov-uint16.cc, ov-uint32.cc, ov-uint64.cc, ov-scalar.cc,
ov-flt-complex.cc, ov-complex.cc, ov-classdef.cc, ov-bool.cc,
Array-jit.cc, Array-os.cc, Array-tc.cc, Array-C.cc, Array-b.cc,
Array-ch.cc, Array-d.cc, Array-f.cc, Array-fC.cc, Array-i.cc,
Array-idx-vec.cc, Array-s.cc, Array-str.cc, Array-voidp.cc:
Prevent impliticit template instantiation.
* Array-tc.cc: Also instantiate Array<cdef_object>.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 01 Apr 2016 12:04:04 -0400 |
| parents | 09ed6f7538dd |
| children | ae4d7dfea337 |
| rev | line source |
|---|---|
| 2871 | 1 /* |
| 2 | |
|
19697
4197fc428c7d
maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents:
19598
diff
changeset
|
3 Copyright (C) 1996-2015 John W. Eaton |
| 2871 | 4 |
| 5 This file is part of Octave. | |
| 6 | |
| 7 Octave is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 7016 | 9 Free Software Foundation; either version 3 of the License, or (at your |
| 10 option) any later version. | |
| 2871 | 11 |
| 12 Octave is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 7016 | 18 along with Octave; see the file COPYING. If not, see |
| 19 <http://www.gnu.org/licenses/>. | |
| 2871 | 20 |
| 21 */ | |
| 22 | |
| 23 #ifdef HAVE_CONFIG_H | |
| 24 #include <config.h> | |
| 25 #endif | |
| 26 | |
| 3503 | 27 #include <iostream> |
| 2901 | 28 |
| 2871 | 29 #include "mx-base.h" |
| 30 | |
| 31 #include "gripes.h" | |
|
15149
62a35ae7d6a2
use forward decls for mxArray in ov.h and ov-base.h
John W. Eaton <jwe@octave.org>
parents:
15057
diff
changeset
|
32 #include "mxarray.h" |
|
19863
09ed6f7538dd
avoid needing to include hdf5 in public header files (bug #44370, #43180)
John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
parents:
19697
diff
changeset
|
33 #include "oct-hdf5.h" |
| 2871 | 34 #include "oct-obj.h" |
| 35 #include "ops.h" | |
| 36 #include "ov-bool.h" | |
| 4964 | 37 #include "ov-bool-mat.h" |
| 3223 | 38 #include "ov-base.h" |
| 39 #include "ov-base-scalar.h" | |
| 40 #include "ov-base-scalar.cc" | |
| 2871 | 41 #include "ov-re-mat.h" |
| 42 #include "ov-scalar.h" | |
| 43 #include "pr-output.h" | |
| 44 | |
| 4687 | 45 #include "ls-oct-ascii.h" |
| 46 #include "ls-hdf5.h" | |
| 47 | |
|
21573
f3f8e1d3e399
avoid mulitple definitions of static function-scope vars (bug #47372)
John W. Eaton <jwe@octave.org>
parents:
19863
diff
changeset
|
48 // Prevent implicit instantiations on some systems (Windows, others?) |
|
f3f8e1d3e399
avoid mulitple definitions of static function-scope vars (bug #47372)
John W. Eaton <jwe@octave.org>
parents:
19863
diff
changeset
|
49 // that can lead to duplicate definitions of static data members. |
|
f3f8e1d3e399
avoid mulitple definitions of static function-scope vars (bug #47372)
John W. Eaton <jwe@octave.org>
parents:
19863
diff
changeset
|
50 |
|
f3f8e1d3e399
avoid mulitple definitions of static function-scope vars (bug #47372)
John W. Eaton <jwe@octave.org>
parents:
19863
diff
changeset
|
51 extern template class OCTINTERP_API octave_base_scalar<double>; |
|
f3f8e1d3e399
avoid mulitple definitions of static function-scope vars (bug #47372)
John W. Eaton <jwe@octave.org>
parents:
19863
diff
changeset
|
52 |
|
f3f8e1d3e399
avoid mulitple definitions of static function-scope vars (bug #47372)
John W. Eaton <jwe@octave.org>
parents:
19863
diff
changeset
|
53 |
| 3223 | 54 template class octave_base_scalar<bool>; |
| 55 | |
| 2871 | 56 |
| 4612 | 57 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_bool, "bool", "logical"); |
| 2871 | 58 |
| 5759 | 59 static octave_base_value * |
| 60 default_numeric_conversion_function (const octave_base_value& a) | |
| 2871 | 61 { |
| 62 CAST_CONV_ARG (const octave_bool&); | |
| 63 | |
| 64 return new octave_scalar (v.bool_value ()); | |
| 65 } | |
| 66 | |
|
8345
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
7017
diff
changeset
|
67 octave_base_value::type_conv_info |
| 2871 | 68 octave_bool::numeric_conversion_function (void) const |
| 69 { | |
|
8345
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
7017
diff
changeset
|
70 return octave_base_value::type_conv_info (default_numeric_conversion_function, |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
7017
diff
changeset
|
71 octave_scalar::static_type_id ()); |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
7017
diff
changeset
|
72 |
| 2871 | 73 } |
| 74 | |
| 75 octave_value | |
| 5885 | 76 octave_bool::do_index_op (const octave_value_list& idx, bool resize_ok) |
| 2871 | 77 { |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
78 // FIXME: this doesn't solve the problem of |
|
8437
f00578b495e9
remove valid_as_scalar_index
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
79 // |
|
f00578b495e9
remove valid_as_scalar_index
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
80 // a = 1; a([1,1], [1,1], [1,1]) |
|
f00578b495e9
remove valid_as_scalar_index
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
81 // |
|
f00578b495e9
remove valid_as_scalar_index
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
82 // and similar constructions. Hmm... |
| 2871 | 83 |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
84 // FIXME: using this constructor avoids narrowing the |
|
8437
f00578b495e9
remove valid_as_scalar_index
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
85 // 1x1 matrix back to a scalar value. Need a better solution |
|
f00578b495e9
remove valid_as_scalar_index
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
86 // to this problem. |
| 2871 | 87 |
|
8437
f00578b495e9
remove valid_as_scalar_index
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
88 octave_value tmp (new octave_bool_matrix (bool_matrix_value ())); |
| 2871 | 89 |
|
8437
f00578b495e9
remove valid_as_scalar_index
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
90 return tmp.do_index_op (idx, resize_ok); |
| 2871 | 91 } |
| 92 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
93 octave_value |
| 5731 | 94 octave_bool::resize (const dim_vector& dv, bool fill) const |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
95 { |
| 5731 | 96 if (fill) |
| 97 { | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
98 boolNDArray retval (dv, false); |
|
14846
460a3c6d8bf1
maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
99 if (dv.numel ()) |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
100 retval(0) = scalar; |
|
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
101 return retval; |
| 5731 | 102 } |
| 103 else | |
| 104 { | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
105 boolNDArray retval (dv); |
|
14846
460a3c6d8bf1
maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
106 if (dv.numel ()) |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
107 retval(0) = scalar; |
|
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
108 return retval; |
| 5731 | 109 } |
| 110 } | |
| 111 | |
| 2871 | 112 octave_value |
| 5279 | 113 octave_bool::convert_to_str_internal (bool, bool, char type) const |
| 2871 | 114 { |
| 115 char s[2]; | |
| 4358 | 116 s[0] = static_cast<char> (scalar); |
| 2871 | 117 s[1] = '\0'; |
| 118 | |
| 5279 | 119 return octave_value (s, type); |
| 2871 | 120 } |
| 121 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
122 bool |
| 6974 | 123 octave_bool::save_ascii (std::ostream& os) |
| 4687 | 124 { |
| 125 double d = double_value (); | |
| 126 | |
| 127 octave_write_double (os, d); | |
| 128 os << "\n"; | |
| 129 | |
| 130 return true; | |
| 131 } | |
| 132 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
133 bool |
| 4687 | 134 octave_bool::load_ascii (std::istream& is) |
| 135 { | |
|
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
136 scalar = (octave_read_value<double> (is) != 0.); |
| 4687 | 137 |
| 138 if (!is) | |
| 139 { | |
| 140 error ("load: failed to load scalar constant"); | |
| 141 return false; | |
| 142 } | |
| 143 | |
| 144 return true; | |
| 145 } | |
| 146 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
147 bool |
| 4687 | 148 octave_bool::save_binary (std::ostream& os, bool& /* save_as_floats */) |
| 149 { | |
| 150 char tmp = (scalar ? 1 : 0); | |
| 5760 | 151 os.write (reinterpret_cast<char *> (&tmp), 1); |
| 4687 | 152 |
| 153 return true; | |
| 154 } | |
| 155 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
156 bool |
| 4687 | 157 octave_bool::load_binary (std::istream& is, bool /* swap */, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
158 oct_mach_info::float_format /* fmt */) |
| 4687 | 159 { |
| 160 char tmp; | |
| 5760 | 161 if (! is.read (reinterpret_cast<char *> (&tmp), 1)) |
| 4687 | 162 return false; |
| 163 scalar = (tmp ? 1 : 0); | |
| 164 return true; | |
| 165 } | |
| 166 | |
|
19863
09ed6f7538dd
avoid needing to include hdf5 in public header files (bug #44370, #43180)
John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
parents:
19697
diff
changeset
|
167 bool |
|
09ed6f7538dd
avoid needing to include hdf5 in public header files (bug #44370, #43180)
John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
parents:
19697
diff
changeset
|
168 octave_bool::save_hdf5 (octave_hdf5_id loc_id, const char *name, |
|
09ed6f7538dd
avoid needing to include hdf5 in public header files (bug #44370, #43180)
John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
parents:
19697
diff
changeset
|
169 bool /* save_as_floats */) |
|
09ed6f7538dd
avoid needing to include hdf5 in public header files (bug #44370, #43180)
John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
parents:
19697
diff
changeset
|
170 { |
|
09ed6f7538dd
avoid needing to include hdf5 in public header files (bug #44370, #43180)
John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
parents:
19697
diff
changeset
|
171 bool retval = false; |
|
09ed6f7538dd
avoid needing to include hdf5 in public header files (bug #44370, #43180)
John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
parents:
19697
diff
changeset
|
172 |
| 4687 | 173 #if defined (HAVE_HDF5) |
| 4944 | 174 |
| 4687 | 175 hsize_t dimens[3]; |
|
18100
6a71e5030df5
Follow coding convention of defining and initializing only 1 variable per line in liboctinterp.
Rik <rik@octave.org>
parents:
17787
diff
changeset
|
176 hid_t space_hid, data_hid; |
|
6a71e5030df5
Follow coding convention of defining and initializing only 1 variable per line in liboctinterp.
Rik <rik@octave.org>
parents:
17787
diff
changeset
|
177 space_hid = data_hid = -1; |
| 4687 | 178 |
| 4815 | 179 space_hid = H5Screate_simple (0, dimens, 0); |
| 4687 | 180 if (space_hid < 0) return false; |
|
9892
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
181 #if HAVE_HDF5_18 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
182 data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_DOUBLE, space_hid, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
183 H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); |
|
9892
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
184 #else |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
185 data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_DOUBLE, space_hid, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
186 H5P_DEFAULT); |
|
9892
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
187 #endif |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
188 if (data_hid < 0) |
| 4687 | 189 { |
| 190 H5Sclose (space_hid); | |
| 191 return false; | |
| 192 } | |
| 193 | |
| 194 double tmp = double_value (); | |
| 195 retval = H5Dwrite (data_hid, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
196 H5P_DEFAULT, &tmp) >= 0; |
| 4687 | 197 |
| 198 H5Dclose (data_hid); | |
| 199 H5Sclose (space_hid); | |
| 4837 | 200 |
|
19863
09ed6f7538dd
avoid needing to include hdf5 in public header files (bug #44370, #43180)
John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
parents:
19697
diff
changeset
|
201 #else |
|
09ed6f7538dd
avoid needing to include hdf5 in public header files (bug #44370, #43180)
John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
parents:
19697
diff
changeset
|
202 gripe_save ("hdf5"); |
|
09ed6f7538dd
avoid needing to include hdf5 in public header files (bug #44370, #43180)
John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
parents:
19697
diff
changeset
|
203 #endif |
|
09ed6f7538dd
avoid needing to include hdf5 in public header files (bug #44370, #43180)
John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
parents:
19697
diff
changeset
|
204 |
| 4687 | 205 return retval; |
| 206 } | |
| 207 | |
| 208 bool | |
|
19863
09ed6f7538dd
avoid needing to include hdf5 in public header files (bug #44370, #43180)
John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
parents:
19697
diff
changeset
|
209 octave_bool::load_hdf5 (octave_hdf5_id loc_id, const char *name) |
| 4687 | 210 { |
|
19863
09ed6f7538dd
avoid needing to include hdf5 in public header files (bug #44370, #43180)
John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
parents:
19697
diff
changeset
|
211 #if defined (HAVE_HDF5) |
|
09ed6f7538dd
avoid needing to include hdf5 in public header files (bug #44370, #43180)
John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
parents:
19697
diff
changeset
|
212 |
|
9892
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
213 #if HAVE_HDF5_18 |
|
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
214 hid_t data_hid = H5Dopen (loc_id, name, H5P_DEFAULT); |
|
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
215 #else |
| 4687 | 216 hid_t data_hid = H5Dopen (loc_id, name); |
|
9892
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
217 #endif |
| 4687 | 218 hid_t space_id = H5Dget_space (data_hid); |
| 219 | |
| 220 hsize_t rank = H5Sget_simple_extent_ndims (space_id); | |
| 221 | |
| 222 if (rank != 0) | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
223 { |
| 4687 | 224 H5Dclose (data_hid); |
| 225 return false; | |
| 226 } | |
| 227 | |
| 228 double dtmp; | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
229 if (H5Dread (data_hid, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
230 H5P_DEFAULT, &dtmp) < 0) |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
231 { |
| 4687 | 232 H5Dclose (data_hid); |
| 233 return false; | |
| 234 } | |
| 235 | |
| 236 scalar = (dtmp != 0.); | |
| 4837 | 237 |
| 4687 | 238 H5Dclose (data_hid); |
| 4837 | 239 |
|
19863
09ed6f7538dd
avoid needing to include hdf5 in public header files (bug #44370, #43180)
John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
parents:
19697
diff
changeset
|
240 #else |
|
09ed6f7538dd
avoid needing to include hdf5 in public header files (bug #44370, #43180)
John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
parents:
19697
diff
changeset
|
241 gripe_load ("hdf5"); |
|
09ed6f7538dd
avoid needing to include hdf5 in public header files (bug #44370, #43180)
John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
parents:
19697
diff
changeset
|
242 #endif |
|
09ed6f7538dd
avoid needing to include hdf5 in public header files (bug #44370, #43180)
John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
parents:
19697
diff
changeset
|
243 |
| 4687 | 244 return true; |
| 245 } | |
| 4944 | 246 |
| 5900 | 247 mxArray * |
| 248 octave_bool::as_mxArray (void) const | |
| 249 { | |
| 250 mxArray *retval = new mxArray (mxLOGICAL_CLASS, 1, 1, mxREAL); | |
| 251 | |
| 252 bool *pr = static_cast<bool *> (retval->get_data ()); | |
| 253 | |
| 254 pr[0] = scalar; | |
| 255 | |
| 256 return retval; | |
| 257 } |