octave: libinterp/octave-value/ov-base-int.cc annotate

annotate libinterp/octave-value/ov-base-int.cc @ 26399:586413770c7f

pass save_as_floats by value in octave_value save_binary functions * ov.h (octave_value::save_binary): Pass save_as_floats parameter by value. * ov-base.h, ov-base.cc (octave_base_value::save_binary): Likewise. * ov-base-int.cc, ov-base-int.h, ov-bool-mat.cc, ov-bool-mat.h, ov-bool-sparse.cc, ov-bool-sparse.h, ov-bool.cc, ov-bool.h, ov-cell.cc, ov-cell.h, ov-class.cc, ov-class.h, ov-complex.cc, ov-complex.h, ov-cx-diag.cc, ov-cx-diag.h, ov-cx-mat.cc, ov-cx-mat.h, ov-cx-sparse.cc, ov-cx-sparse.h, ov-fcn-handle.cc, ov-fcn-handle.h, ov-fcn-inline.cc, ov-fcn-inline.h, ov-float.cc, ov-float.h, ov-flt-complex.cc, ov-flt-complex.h, ov-flt-cx-diag.cc, ov-flt-cx-diag.h, ov-flt-cx-mat.cc, ov-flt-cx-mat.h, ov-flt-re-diag.cc, ov-flt-re-diag.h, ov-flt-re-mat.cc, ov-flt-re-mat.h, ov-java.cc, ov-java.h, ov-lazy-idx.cc, ov-lazy-idx.h, ov-oncleanup.cc, ov-oncleanup.h, ov-perm.cc, ov-perm.h, ov-range.cc, ov-range.h, ov-re-diag.cc, ov-re-diag.h, ov-re-mat.cc, ov-re-mat.h, ov-re-sparse.cc, ov-re-sparse.h, ov-scalar.cc, ov-scalar.h, ov-str-mat.cc, ov-str-mat.h, ov-struct.cc, ov-struct.h: Pass save_as_floats parameter by value in all classes derived from octave_base_value.

author	John W. Eaton <jwe@octave.org>
date	Thu, 03 Jan 2019 09:36:00 -0500
parents	00f796120a6d
children	b442ec6dda5c

rev	line source
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	1 /*
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	2
26376 00f796120a6d maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 25438 diff changeset	3 Copyright (C) 2004-2019 John W. Eaton
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	4
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	5 This file is part of Octave.
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	6
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24224 diff changeset	7 Octave is free software: you can redistribute it and/or modify it
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	8 under the terms of the GNU General Public License as published by
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24224 diff changeset	9 the Free Software Foundation, either version 3 of the License, or
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	10 (at your option) any later version.
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	11
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	12 Octave is distributed in the hope that it will be useful, but
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	13 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	15 GNU General Public License for more details.
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	16
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	17 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6974 diff changeset	18 along with Octave; see the file COPYING. If not, see
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24224 diff changeset	19 <https://www.gnu.org/licenses/>.
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	20
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	21 */
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	22
21690 b6a686543080 Only include config.h in files that are compiled separately. John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	23 // This file should not include config.h. It is only included in other
b6a686543080 Only include config.h in files that are compiled separately. John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	24 // C++ source files that should have included config.h before including
b6a686543080 Only include config.h in files that are compiled separately. John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	25 // this file.
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	26
25438 cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	27 #include <istream>
15215 9020dddc925a use std::numeric_limits for integer max and min values John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	28 #include <limits>
25438 cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	29 #include <ostream>
cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	30 #include <sstream>
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	31 #include <vector>
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	32
22296 8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	33 #include "dNDArray.h"
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	34 #include "fNDArray.h"
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	35 #include "int8NDArray.h"
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	36 #include "int16NDArray.h"
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	37 #include "int32NDArray.h"
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	38 #include "int64NDArray.h"
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	39 #include "uint8NDArray.h"
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	40 #include "uint16NDArray.h"
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	41 #include "uint32NDArray.h"
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	42 #include "uint64NDArray.h"
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	43
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	44 #include "lo-ieee.h"
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	45 #include "lo-utils.h"
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	46 #include "mx-base.h"
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	47 #include "quit.h"
8377 25bc2d31e1bf improve OCTAVE_LOCAL_BUFFER Jaroslav Hajek <highegg@gmail.com> parents: 7534 diff changeset	48 #include "oct-locbuf.h"
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	49
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	50 #include "defun.h"
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 21022 diff changeset	51 #include "errwarn.h"
20940 48b2ad5ee801 maint: Rename oct-obj.[cc\|h] to ovl.[cc\|h] for clarity. Rik <rik@octave.org> parents: 20893 diff changeset	52 #include "ovl.h"
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	53 #include "oct-lvalue.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	54 #include "oct-hdf5.h"
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4932 diff changeset	55 #include "oct-stream.h"
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	56 #include "ops.h"
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	57 #include "ov-base.h"
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	58 #include "ov-base-mat.h"
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	59 #include "ov-base-mat.cc"
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	60 #include "ov-base-scalar.h"
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	61 #include "ov-base-scalar.cc"
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	62 #include "ov-base-int.h"
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	63 #include "ov-int-traits.h"
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	64 #include "pr-output.h"
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	65 #include "variables.h"
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	66
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	67 #include "byte-swap.h"
20447 c6224b4e7774 maint: Rename instances of LS_ASCII to LS_TEXT for clarity. Rik <rik@octave.org> parents: 20228 diff changeset	68 #include "ls-oct-text.h"
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	69 #include "ls-utils.h"
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	70 #include "ls-hdf5.h"
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	71
7534 ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	72 // We have all the machinery below (octave_base_int_helper and
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	73 // octave_base_int_helper_traits) to avoid a few warnings from GCC
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	74 // about comparisons always false due to limited range of data types.
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	75 // Ugh. The cure may be worse than the disease.
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	76
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21124 diff changeset	77 template <typename T, bool is_signed = true, bool can_be_too_big = true>
7534 ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	78 struct octave_base_int_helper
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	79 {
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	80 static bool
15215 9020dddc925a use std::numeric_limits for integer max and min values John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	81 char_value_out_of_range (T val)
9020dddc925a use std::numeric_limits for integer max and min values John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	82 {
9020dddc925a use std::numeric_limits for integer max and min values John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	83 return val < 0 \|\| val > std::numeric_limits<unsigned char>::max ();
9020dddc925a use std::numeric_limits for integer max and min values John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	84 }
7534 ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	85 };
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	86
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21124 diff changeset	87 template <typename T>
7534 ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	88 struct octave_base_int_helper<T, false, false>
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	89 {
9149 7120fbbecf97 ov-base-int.cc: correct result for template specialization John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	90 static bool char_value_out_of_range (T) { return false; }
7534 ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	91 };
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	92
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21124 diff changeset	93 template <typename T>
7534 ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	94 struct octave_base_int_helper<T, false, true>
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	95 {
15215 9020dddc925a use std::numeric_limits for integer max and min values John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	96 static bool char_value_out_of_range (T val)
9020dddc925a use std::numeric_limits for integer max and min values John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	97 {
9020dddc925a use std::numeric_limits for integer max and min values John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	98 return val > std::numeric_limits<unsigned char>::max ();
9020dddc925a use std::numeric_limits for integer max and min values John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	99 }
7534 ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	100 };
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	101
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21124 diff changeset	102 template <typename T>
7534 ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	103 struct octave_base_int_helper<T, true, false>
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	104 {
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	105 static bool char_value_out_of_range (T val) { return val < 0; }
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	106 };
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	107
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	108 // For all types other than char, signed char, and unsigned char, we
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	109 // assume that the upper limit for the range of allowable values is
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	110 // larger than the range for unsigned char. If that's not true, we
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	111 // are still OK, but will see the warnings again for any other types
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	112 // that do not meet this assumption.
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	113
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21124 diff changeset	114 template <typename T>
7534 ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	115 struct octave_base_int_helper_traits
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	116 {
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	117 static const bool can_be_larger_than_uchar_max = true;
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	118 };
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	119
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	120 template <>
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	121 struct octave_base_int_helper_traits<char>
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	122 {
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	123 static const bool can_be_larger_than_uchar_max = false;
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	124 };
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	125
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	126 template <>
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	127 struct octave_base_int_helper_traits<signed char>
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	128 {
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	129 static const bool can_be_larger_than_uchar_max = false;
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	130 };
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	131
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	132 template <>
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	133 struct octave_base_int_helper_traits<unsigned char>
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	134 {
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	135 static const bool can_be_larger_than_uchar_max = false;
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	136 };
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	137
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21124 diff changeset	138 template <typename T>
5759 ce79d238f142 [project @ 2006-04-13 13:04:32 by jwe] jwe parents: 5307 diff changeset	139 octave_base_value *
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	140 octave_base_int_matrix<T>::try_narrowing_conversion (void)
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	141 {
23457 21baad6b35c4 maint: Use C++11 nullptr rather than 0 or NULL when possible. Rik <rik@octave.org> parents: 23220 diff changeset	142 octave_base_value *retval = nullptr;
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	143
20228 00cf2847355d Deprecate Array::nelem() and Range::nelem() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20218 diff changeset	144 if (this->matrix.numel () == 1)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	145 retval = new typename octave_value_int_traits<T>::scalar_type
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	146 (this->matrix (0));
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	147
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	148 return retval;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	149 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	150
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21124 diff changeset	151 template <typename T>
5992 4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	152 octave_value
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	153 octave_base_int_matrix<T>::convert_to_str_internal (bool, bool, char type) const
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	154 {
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	155 octave_value retval;
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	156 dim_vector dv = this->dims ();
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	157 octave_idx_type nel = dv.numel ();
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	158
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	159 charNDArray chm (dv);
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	160
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	161 bool warned = false;
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	162
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	163 for (octave_idx_type i = 0; i < nel; i++)
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	164 {
10142 829e69ec3110 make OCTAVE_QUIT a function Jaroslav Hajek <highegg@gmail.com> parents: 9892 diff changeset	165 octave_quit ();
5992 4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	166
8918 f5408862892f Consistently use element_type in the array classes. Jason Riedy <jason@acm.org> parents: 8377 diff changeset	167 typename T::element_type tmp = this->matrix(i);
5992 4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	168
8918 f5408862892f Consistently use element_type in the array classes. Jason Riedy <jason@acm.org> parents: 8377 diff changeset	169 typedef typename T::element_type::val_type val_type;
7534 ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	170
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	171 val_type ival = tmp.value ();
5992 4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	172
7534 ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	173 static const bool is_signed = std::numeric_limits<val_type>::is_signed;
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	174 static const bool can_be_larger_than_uchar_max
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	175 = octave_base_int_helper_traits<val_type>::can_be_larger_than_uchar_max;
7534 ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	176
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	177 if (octave_base_int_helper<val_type, is_signed,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	178 can_be_larger_than_uchar_max>::char_value_out_of_range (ival))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	179 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	180 // FIXME: is there something better we could do?
5992 4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	181
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	182 ival = 0;
5992 4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	183
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	184 if (! warned)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	185 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	186 ::warning ("range error for conversion to character value");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	187 warned = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	188 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	189 }
5992 4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	190 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	191 chm (i) = static_cast<char> (ival);
5992 4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	192 }
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	193
9689 34d6f005db4b eliminate is_string argument from octave_value character array constructors John W. Eaton <jwe@octave.org> parents: 9149 diff changeset	194 retval = octave_value (chm, type);
5992 4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	195
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	196 return retval;
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	197 }
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	198
22296 8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	199 template <typename MT>
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	200 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	201 octave_base_int_matrix<MT>::as_double (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	202 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	203 return NDArray (this->matrix);
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	204 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	205
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	206 template <typename MT>
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	207 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	208 octave_base_int_matrix<MT>::as_single (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	209 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	210 return FloatNDArray (this->matrix);
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	211 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	212
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	213 template <typename MT>
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	214 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	215 octave_base_int_matrix<MT>::as_int8 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	216 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	217 return int8NDArray (this->matrix);
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	218 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	219
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	220 template <typename MT>
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	221 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	222 octave_base_int_matrix<MT>::as_int16 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	223 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	224 return int16NDArray (this->matrix);
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	225 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	226
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	227 template <typename MT>
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	228 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	229 octave_base_int_matrix<MT>::as_int32 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	230 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	231 return int32NDArray (this->matrix);
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	232 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	233
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	234 template <typename MT>
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	235 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	236 octave_base_int_matrix<MT>::as_int64 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	237 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	238 return int64NDArray (this->matrix);
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	239 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	240
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	241 template <typename MT>
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	242 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	243 octave_base_int_matrix<MT>::as_uint8 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	244 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	245 return uint8NDArray (this->matrix);
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	246 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	247
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	248 template <typename MT>
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	249 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	250 octave_base_int_matrix<MT>::as_uint16 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	251 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	252 return uint16NDArray (this->matrix);
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	253 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	254
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	255 template <typename MT>
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	256 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	257 octave_base_int_matrix<MT>::as_uint32 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	258 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	259 return uint32NDArray (this->matrix);
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	260 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	261
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	262 template <typename MT>
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	263 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	264 octave_base_int_matrix<MT>::as_uint64 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	265 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	266 return uint64NDArray (this->matrix);
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	267 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	268
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21124 diff changeset	269 template <typename T>
24745 d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24580 diff changeset	270 std::string
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24580 diff changeset	271 octave_base_int_matrix<T>::edit_display (const float_display_format& fmt,
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24580 diff changeset	272 octave_idx_type i,
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24580 diff changeset	273 octave_idx_type j) const
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24580 diff changeset	274 {
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24580 diff changeset	275 std::ostringstream buf;
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24580 diff changeset	276 octave_print_internal (buf, fmt, this->matrix(i,j));
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24580 diff changeset	277 return buf.str ();
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24580 diff changeset	278 }
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24580 diff changeset	279
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24580 diff changeset	280 template <typename T>
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	281 bool
6974 9e32bb109980 [project @ 2007-10-08 11:06:47 by jwe] jwe parents: 6959 diff changeset	282 octave_base_int_matrix<T>::save_ascii (std::ostream& os)
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	283 {
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21301 diff changeset	284 dim_vector dv = this->dims ();
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	285
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21301 diff changeset	286 os << "# ndims: " << dv.ndims () << "\n";
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	287
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21301 diff changeset	288 for (int i = 0; i < dv.ndims (); i++)
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23795 diff changeset	289 os << ' ' << dv(i);
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	290
4932 43f4ebd2704c [project @ 2004-08-05 13:26:10 by jwe] jwe parents: 4917 diff changeset	291 os << "\n" << this->matrix;
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	292
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	293 return true;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	294 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	295
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21124 diff changeset	296 template <typename T>
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	297 bool
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	298 octave_base_int_matrix<T>::load_ascii (std::istream& is)
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	299 {
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	300 int mdims = 0;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	301
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	302 if (! extract_keyword (is, "ndims", mdims, true))
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	303 error ("load: failed to extract number of dimensions");
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	304
20978 a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	305 if (mdims < 0)
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	306 error ("load: failed to extract number of rows and columns");
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	307
20978 a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	308 dim_vector dv;
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	309 dv.resize (mdims);
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	310
20978 a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	311 for (int i = 0; i < mdims; i++)
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	312 is >> dv(i);
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	313
20978 a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	314 T tmp(dv);
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	315
20978 a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	316 is >> tmp;
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	317
20978 a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	318 if (! is)
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	319 error ("load: failed to load matrix constant");
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	320
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	321 this->matrix = tmp;
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	322
21124 95f8c8cdbffe maint: Eliminate 'bool success' variable where possible. Rik <rik@octave.org> parents: 21102 diff changeset	323 return true;
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	324 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	325
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21124 diff changeset	326 template <typename T>
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	327 bool
26399 586413770c7f pass save_as_floats by value in octave_value save_binary functions John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	328 octave_base_int_matrix<T>::save_binary (std::ostream& os, bool)
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	329 {
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21301 diff changeset	330 dim_vector dv = this->dims ();
53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21301 diff changeset	331 if (dv.ndims () < 1)
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	332 return false;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	333
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	334 // Use negative value for ndims to differentiate with old format!!
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21301 diff changeset	335 int32_t tmp = - dv.ndims ();
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	336 os.write (reinterpret_cast<char *> (&tmp), 4);
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21301 diff changeset	337 for (int i=0; i < dv.ndims (); i++)
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	338 {
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21301 diff changeset	339 tmp = dv(i);
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	340 os.write (reinterpret_cast<char *> (&tmp), 4);
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	341 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	342
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	343 os.write (reinterpret_cast<const char *> (this->matrix.data ()),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	344 this->byte_size ());
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	345
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	346 return true;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	347 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	348
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21124 diff changeset	349 template <typename T>
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	350 bool
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	351 octave_base_int_matrix<T>::load_binary (std::istream& is, bool swap,
21739 c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21691 diff changeset	352 octave::mach_info::float_format)
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	353 {
5828 22e23bee74c8 [project @ 2006-05-23 06:05:14 by jwe] jwe parents: 5760 diff changeset	354 int32_t mdims;
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	355 if (! is.read (reinterpret_cast<char *> (&mdims), 4))
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	356 return false;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	357 if (swap)
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4932 diff changeset	358 swap_bytes<4> (&mdims);
4917 f69e95587ba3 [project @ 2004-07-27 14:03:03 by jwe] jwe parents: 4903 diff changeset	359 if (mdims >= 0)
f69e95587ba3 [project @ 2004-07-27 14:03:03 by jwe] jwe parents: 4903 diff changeset	360 return false;
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	361
4917 f69e95587ba3 [project @ 2004-07-27 14:03:03 by jwe] jwe parents: 4903 diff changeset	362 mdims = - mdims;
5828 22e23bee74c8 [project @ 2006-05-23 06:05:14 by jwe] jwe parents: 5760 diff changeset	363 int32_t di;
4917 f69e95587ba3 [project @ 2004-07-27 14:03:03 by jwe] jwe parents: 4903 diff changeset	364 dim_vector dv;
f69e95587ba3 [project @ 2004-07-27 14:03:03 by jwe] jwe parents: 4903 diff changeset	365 dv.resize (mdims);
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	366
4917 f69e95587ba3 [project @ 2004-07-27 14:03:03 by jwe] jwe parents: 4903 diff changeset	367 for (int i = 0; i < mdims; i++)
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	368 {
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	369 if (! is.read (reinterpret_cast<char *> (&di), 4))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	370 return false;
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	371 if (swap)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	372 swap_bytes<4> (&di);
4917 f69e95587ba3 [project @ 2004-07-27 14:03:03 by jwe] jwe parents: 4903 diff changeset	373 dv(i) = di;
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	374 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	375
5157 8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	376 // Convert an array with a single dimension to be a row vector.
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	377 // Octave should never write files like this, other software
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	378 // might.
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	379
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	380 if (mdims == 1)
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	381 {
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	382 mdims = 2;
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	383 dv.resize (mdims);
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	384 dv(1) = dv(0);
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	385 dv(0) = 1;
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	386 }
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	387
4917 f69e95587ba3 [project @ 2004-07-27 14:03:03 by jwe] jwe parents: 4903 diff changeset	388 T m (dv);
f69e95587ba3 [project @ 2004-07-27 14:03:03 by jwe] jwe parents: 4903 diff changeset	389
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	390 if (! is.read (reinterpret_cast<char *> (m.fortran_vec ()), m.byte_size ()))
4917 f69e95587ba3 [project @ 2004-07-27 14:03:03 by jwe] jwe parents: 4903 diff changeset	391 return false;
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	392
4917 f69e95587ba3 [project @ 2004-07-27 14:03:03 by jwe] jwe parents: 4903 diff changeset	393 if (swap)
f69e95587ba3 [project @ 2004-07-27 14:03:03 by jwe] jwe parents: 4903 diff changeset	394 {
f69e95587ba3 [project @ 2004-07-27 14:03:03 by jwe] jwe parents: 4903 diff changeset	395 int nel = dv.numel ();
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	396 int bytes = nel / m.byte_size ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	397 for (int i = 0; i < nel; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	398 switch (bytes)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	399 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	400 case 8:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	401 swap_bytes<8> (&m(i));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	402 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	403 case 4:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	404 swap_bytes<4> (&m(i));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	405 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	406 case 2:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	407 swap_bytes<2> (&m(i));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	408 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	409 case 1:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	410 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	411 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	412 }
4917 f69e95587ba3 [project @ 2004-07-27 14:03:03 by jwe] jwe parents: 4903 diff changeset	413 }
f69e95587ba3 [project @ 2004-07-27 14:03:03 by jwe] jwe parents: 4903 diff changeset	414
4932 43f4ebd2704c [project @ 2004-08-05 13:26:10 by jwe] jwe parents: 4917 diff changeset	415 this->matrix = m;
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	416 return true;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	417 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	418
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21124 diff changeset	419 template <typename T>
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	420 bool
24224 ff81c6772664 avoid issue with link-time optimization John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	421 octave_base_int_matrix<T>::save_hdf5_internal (octave_hdf5_id loc_id,
ff81c6772664 avoid issue with link-time optimization John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	422 octave_hdf5_id save_type,
ff81c6772664 avoid issue with link-time optimization John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	423 const char *name, bool)
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	424 {
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	425 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	426
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	427 #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	428
24224 ff81c6772664 avoid issue with link-time optimization John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	429 hid_t save_type_hid = save_type;
4932 43f4ebd2704c [project @ 2004-08-05 13:26:10 by jwe] jwe parents: 4917 diff changeset	430 dim_vector dv = this->dims ();
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	431 int empty = save_hdf5_empty (loc_id, name, dv);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	432 if (empty)
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	433 return (empty > 0);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	434
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21301 diff changeset	435 int rank = dv.ndims ();
18100 6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17787 diff changeset	436 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	437 space_hid = data_hid = -1;
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	438 OCTAVE_LOCAL_BUFFER (hsize_t, hdims, rank);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	439
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	440 // Octave uses column-major, while HDF5 uses row-major ordering
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	441 for (int i = 0; i < rank; i++)
20218 b2100e1659ac maint: Use cuddled parentheses when indexing dimension_vectors. Rik <rik@octave.org> parents: 19875 diff changeset	442 hdims[i] = dv(rank-i-1);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	443
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23457 diff changeset	444 space_hid = H5Screate_simple (rank, hdims, nullptr);
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	445
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	446 if (space_hid < 0) return false;
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	447 #if defined (HAVE_HDF5_18)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	448 data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid,
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 20978 diff changeset	449 octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_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	450 #else
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	451 data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid,
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 20978 diff changeset	452 octave_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	453 #endif
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	454 if (data_hid < 0)
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	455 {
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	456 H5Sclose (space_hid);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	457 return false;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	458 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	459
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 20978 diff changeset	460 retval = H5Dwrite (data_hid, save_type_hid, octave_H5S_ALL, octave_H5S_ALL,
ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 20978 diff changeset	461 octave_H5P_DEFAULT, this->matrix.data ()) >= 0;
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	462
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	463 H5Dclose (data_hid);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	464 H5Sclose (space_hid);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	465
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	466 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21690 diff changeset	467 octave_unused_parameter (loc_id);
24580 a276f008ea74 avoid unused variable warnings if compiling without HDF5 (bug #52850) John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	468 octave_unused_parameter (save_type);
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21690 diff changeset	469 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21690 diff changeset	470
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	471 this->warn_save ("hdf5");
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	472 #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	473
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	474 return retval;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	475 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	476
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21124 diff changeset	477 template <typename T>
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	478 bool
24224 ff81c6772664 avoid issue with link-time optimization John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	479 octave_base_int_matrix<T>::load_hdf5_internal (octave_hdf5_id loc_id,
ff81c6772664 avoid issue with link-time optimization John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	480 octave_hdf5_id save_type,
ff81c6772664 avoid issue with link-time optimization John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	481 const char *name)
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	482 {
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	483 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	484
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	485 #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	486
24224 ff81c6772664 avoid issue with link-time optimization John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	487 hid_t save_type_hid = save_type;
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	488 dim_vector dv;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	489 int empty = load_hdf5_empty (loc_id, name, dv);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	490 if (empty > 0)
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	491 this->matrix.resize (dv);
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	492 if (empty)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	493 return (empty > 0);
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	494
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	495 #if defined (HAVE_HDF5_18)
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 20978 diff changeset	496 hid_t data_hid = H5Dopen (loc_id, name, octave_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	497 #else
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	498 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	499 #endif
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	500 hid_t space_id = H5Dget_space (data_hid);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	501
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	502 hsize_t rank = H5Sget_simple_extent_ndims (space_id);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	503
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	504 if (rank < 1)
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	505 {
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	506 H5Sclose (space_id);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	507 H5Dclose (data_hid);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	508 return false;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	509 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	510
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	511 OCTAVE_LOCAL_BUFFER (hsize_t, hdims, rank);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	512 OCTAVE_LOCAL_BUFFER (hsize_t, maxdims, rank);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	513
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	514 H5Sget_simple_extent_dims (space_id, hdims, maxdims);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	515
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	516 // Octave uses column-major, while HDF5 uses row-major ordering
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	517 if (rank == 1)
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	518 {
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	519 dv.resize (2);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	520 dv(0) = 1;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	521 dv(1) = hdims[0];
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	522 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	523 else
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	524 {
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	525 dv.resize (rank);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	526 for (hsize_t i = 0, j = rank - 1; i < rank; i++, j--)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	527 dv(j) = hdims[i];
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	528 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	529
4917 f69e95587ba3 [project @ 2004-07-27 14:03:03 by jwe] jwe parents: 4903 diff changeset	530 T m (dv);
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 20978 diff changeset	531 if (H5Dread (data_hid, save_type_hid, octave_H5S_ALL, octave_H5S_ALL,
ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 20978 diff changeset	532 octave_H5P_DEFAULT, m.fortran_vec ()) >= 0)
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	533 {
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	534 retval = true;
4932 43f4ebd2704c [project @ 2004-08-05 13:26:10 by jwe] jwe parents: 4917 diff changeset	535 this->matrix = m;
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	536 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	537
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	538 H5Sclose (space_id);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	539 H5Dclose (data_hid);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	540
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	541 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21690 diff changeset	542 octave_unused_parameter (loc_id);
24580 a276f008ea74 avoid unused variable warnings if compiling without HDF5 (bug #52850) John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	543 octave_unused_parameter (save_type);
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21690 diff changeset	544 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21690 diff changeset	545
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	546 this->warn_load ("hdf5");
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	547 #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	548
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	549 return retval;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	550 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	551
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21124 diff changeset	552 template <typename T>
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	553 void
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	554 octave_base_int_matrix<T>::print_raw (std::ostream& os,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	555 bool pr_as_read_syntax) const
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	556 {
4932 43f4ebd2704c [project @ 2004-08-05 13:26:10 by jwe] jwe parents: 4917 diff changeset	557 octave_print_internal (os, this->matrix, pr_as_read_syntax,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	558 this->current_print_indent_level ());
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	559 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	560
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21124 diff changeset	561 template <typename T>
5992 4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	562 octave_value
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	563 octave_base_int_scalar<T>::convert_to_str_internal (bool, bool, char type) const
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	564 {
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	565 octave_value retval;
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	566
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	567 T tmp = this->scalar;
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	568
7534 ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	569 typedef typename T::val_type val_type;
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	570
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	571 val_type ival = tmp.value ();
5992 4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	572
7534 ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	573 static const bool is_signed = std::numeric_limits<val_type>::is_signed;
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	574 static const bool can_be_larger_than_uchar_max
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	575 = octave_base_int_helper_traits<val_type>::can_be_larger_than_uchar_max;
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	576
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	577 if (octave_base_int_helper<val_type, is_signed,
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	578 can_be_larger_than_uchar_max>::char_value_out_of_range (ival))
5992 4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	579 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	580 // FIXME: is there something better we could do?
5992 4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	581
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	582 ival = 0;
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	583
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	584 ::warning ("range error for conversion to character value");
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	585 }
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	586 else
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	587 retval = octave_value (std::string (1, static_cast<char> (ival)), type);
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	588
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	589 return retval;
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	590 }
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	591
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21124 diff changeset	592 template <typename T>
22296 8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	593 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	594 octave_base_int_scalar<T>::as_double (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	595 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	596 return static_cast<double> (this->scalar);
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	597 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	598
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	599 template <typename T>
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	600 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	601 octave_base_int_scalar<T>::as_single (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	602 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	603 return static_cast<float> (this->scalar);
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	604 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	605
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	606 template <typename T>
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	607 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	608 octave_base_int_scalar<T>::as_int8 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	609 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	610 return octave_int8 (this->scalar);
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	611 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	612
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	613 template <typename T>
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	614 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	615 octave_base_int_scalar<T>::as_int16 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	616 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	617 return octave_int16 (this->scalar);
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	618 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	619
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	620 template <typename T>
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	621 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	622 octave_base_int_scalar<T>::as_int32 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	623 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	624 return octave_int32 (this->scalar);
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	625 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	626
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	627 template <typename T>
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	628 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	629 octave_base_int_scalar<T>::as_int64 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	630 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	631 return octave_int64 (this->scalar);
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	632 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	633
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	634 template <typename T>
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	635 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	636 octave_base_int_scalar<T>::as_uint8 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	637 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	638 return octave_uint8 (this->scalar);
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	639 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	640
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	641 template <typename T>
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	642 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	643 octave_base_int_scalar<T>::as_uint16 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	644 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	645 return octave_uint16 (this->scalar);
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	646 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	647
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	648 template <typename T>
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	649 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	650 octave_base_int_scalar<T>::as_uint32 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	651 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	652 return octave_uint32 (this->scalar);
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	653 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	654
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	655 template <typename T>
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	656 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	657 octave_base_int_scalar<T>::as_uint64 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	658 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	659 return octave_uint64 (this->scalar);
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	660 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	661
24745 d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24580 diff changeset	662 template <typename ST>
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24580 diff changeset	663 std::string
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24580 diff changeset	664 octave_base_int_scalar<ST>::edit_display (const float_display_format& fmt,
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24580 diff changeset	665 octave_idx_type,
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24580 diff changeset	666 octave_idx_type) const
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24580 diff changeset	667 {
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24580 diff changeset	668 std::ostringstream buf;
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24580 diff changeset	669 octave_print_internal (buf, fmt, this->scalar);
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24580 diff changeset	670 return buf.str ();
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24580 diff changeset	671 }
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24580 diff changeset	672
22296 8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	673 template <typename T>
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	674 bool
6974 9e32bb109980 [project @ 2007-10-08 11:06:47 by jwe] jwe parents: 6959 diff changeset	675 octave_base_int_scalar<T>::save_ascii (std::ostream& os)
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	676 {
4932 43f4ebd2704c [project @ 2004-08-05 13:26:10 by jwe] jwe parents: 4917 diff changeset	677 os << this->scalar << "\n";
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	678 return true;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	679 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	680
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21124 diff changeset	681 template <typename T>
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	682 bool
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	683 octave_base_int_scalar<T>::load_ascii (std::istream& is)
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	684 {
4932 43f4ebd2704c [project @ 2004-08-05 13:26:10 by jwe] jwe parents: 4917 diff changeset	685 is >> this->scalar;
20893 384ff5aa9437 2015 Code Sprint: Eliminate useless return statements after error (). Rik <rik@octave.org> parents: 20447 diff changeset	686 if (! is)
384ff5aa9437 2015 Code Sprint: Eliminate useless return statements after error (). Rik <rik@octave.org> parents: 20447 diff changeset	687 error ("load: failed to load scalar constant");
384ff5aa9437 2015 Code Sprint: Eliminate useless return statements after error (). Rik <rik@octave.org> parents: 20447 diff changeset	688
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	689 return true;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	690 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	691
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21124 diff changeset	692 template <typename T>
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	693 bool
26399 586413770c7f pass save_as_floats by value in octave_value save_binary functions John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	694 octave_base_int_scalar<T>::save_binary (std::ostream& os, bool)
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	695 {
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	696 os.write (reinterpret_cast<char *> (&(this->scalar)), this->byte_size ());
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	697 return true;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	698 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	699
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21124 diff changeset	700 template <typename T>
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	701 bool
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	702 octave_base_int_scalar<T>::load_binary (std::istream& is, bool swap,
21739 c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21691 diff changeset	703 octave::mach_info::float_format)
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	704 {
4917 f69e95587ba3 [project @ 2004-07-27 14:03:03 by jwe] jwe parents: 4903 diff changeset	705 T tmp;
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	706 if (! is.read (reinterpret_cast<char *> (&tmp), this->byte_size ()))
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	707 return false;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	708
4917 f69e95587ba3 [project @ 2004-07-27 14:03:03 by jwe] jwe parents: 4903 diff changeset	709 if (swap)
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	710 switch (this->byte_size ())
4917 f69e95587ba3 [project @ 2004-07-27 14:03:03 by jwe] jwe parents: 4903 diff changeset	711 {
f69e95587ba3 [project @ 2004-07-27 14:03:03 by jwe] jwe parents: 4903 diff changeset	712 case 8:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	713 swap_bytes<8> (&tmp);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	714 break;
4917 f69e95587ba3 [project @ 2004-07-27 14:03:03 by jwe] jwe parents: 4903 diff changeset	715 case 4:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	716 swap_bytes<4> (&tmp);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	717 break;
4917 f69e95587ba3 [project @ 2004-07-27 14:03:03 by jwe] jwe parents: 4903 diff changeset	718 case 2:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	719 swap_bytes<2> (&tmp);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	720 break;
4917 f69e95587ba3 [project @ 2004-07-27 14:03:03 by jwe] jwe parents: 4903 diff changeset	721 case 1:
f69e95587ba3 [project @ 2004-07-27 14:03:03 by jwe] jwe parents: 4903 diff changeset	722 default:
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	723 break;
4917 f69e95587ba3 [project @ 2004-07-27 14:03:03 by jwe] jwe parents: 4903 diff changeset	724 }
4932 43f4ebd2704c [project @ 2004-08-05 13:26:10 by jwe] jwe parents: 4917 diff changeset	725 this->scalar = tmp;
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	726 return true;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	727 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	728
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21124 diff changeset	729 template <typename T>
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	730 bool
24224 ff81c6772664 avoid issue with link-time optimization John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	731 octave_base_int_scalar<T>::save_hdf5_internal (octave_hdf5_id loc_id,
ff81c6772664 avoid issue with link-time optimization John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	732 octave_hdf5_id save_type,
ff81c6772664 avoid issue with link-time optimization John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	733 const char *name, bool)
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	734 {
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	735 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	736
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	737 #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	738
24224 ff81c6772664 avoid issue with link-time optimization John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	739 hid_t save_type_hid = save_type;
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	740 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	741 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	742 space_hid = data_hid = -1;
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	743
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23457 diff changeset	744 space_hid = H5Screate_simple (0, dimens, nullptr);
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	745 if (space_hid < 0) return false;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	746
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	747 #if defined (HAVE_HDF5_18)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	748 data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid,
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 20978 diff changeset	749 octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_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	750 #else
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	751 data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid,
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 20978 diff changeset	752 octave_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	753 #endif
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	754 if (data_hid < 0)
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	755 {
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	756 H5Sclose (space_hid);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	757 return false;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	758 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	759
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 20978 diff changeset	760 retval = H5Dwrite (data_hid, save_type_hid, octave_H5S_ALL, octave_H5S_ALL,
ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 20978 diff changeset	761 octave_H5P_DEFAULT, &(this->scalar)) >= 0;
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	762
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	763 H5Dclose (data_hid);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	764 H5Sclose (space_hid);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	765
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	766 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21690 diff changeset	767 octave_unused_parameter (loc_id);
24580 a276f008ea74 avoid unused variable warnings if compiling without HDF5 (bug #52850) John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	768 octave_unused_parameter (save_type);
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21690 diff changeset	769 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21690 diff changeset	770
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	771 this->warn_save ("hdf5");
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	772 #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	773
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	774 return retval;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	775 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	776
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21124 diff changeset	777 template <typename T>
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	778 bool
24224 ff81c6772664 avoid issue with link-time optimization John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	779 octave_base_int_scalar<T>::load_hdf5_internal (octave_hdf5_id loc_id,
ff81c6772664 avoid issue with link-time optimization John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	780 octave_hdf5_id save_type,
ff81c6772664 avoid issue with link-time optimization John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	781 const char *name)
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	782 {
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	783 #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	784
24224 ff81c6772664 avoid issue with link-time optimization John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	785 hid_t save_type_hid = save_type;
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	786 #if defined (HAVE_HDF5_18)
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 20978 diff changeset	787 hid_t data_hid = H5Dopen (loc_id, name, octave_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	788 #else
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	789 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	790 #endif
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	791 hid_t space_id = H5Dget_space (data_hid);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	792
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	793 hsize_t rank = H5Sget_simple_extent_ndims (space_id);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	794
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	795 if (rank != 0)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	796 {
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	797 H5Dclose (data_hid);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	798 return false;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	799 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	800
4917 f69e95587ba3 [project @ 2004-07-27 14:03:03 by jwe] jwe parents: 4903 diff changeset	801 T tmp;
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 20978 diff changeset	802 if (H5Dread (data_hid, save_type_hid, octave_H5S_ALL, octave_H5S_ALL,
ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 20978 diff changeset	803 octave_H5P_DEFAULT, &tmp) < 0)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	804 {
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	805 H5Dclose (data_hid);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	806 return false;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	807 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	808
4932 43f4ebd2704c [project @ 2004-08-05 13:26:10 by jwe] jwe parents: 4917 diff changeset	809 this->scalar = tmp;
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	810
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	811 H5Dclose (data_hid);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	812
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	813 return true;
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	814
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	815 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21690 diff changeset	816 octave_unused_parameter (loc_id);
24580 a276f008ea74 avoid unused variable warnings if compiling without HDF5 (bug #52850) John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	817 octave_unused_parameter (save_type);
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21690 diff changeset	818 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21690 diff changeset	819
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	820 this->warn_load ("hdf5");
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21690 diff changeset	821
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	822 return 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	823 #endif
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	824 }

Mercurial > octave

annotate libinterp/octave-value/ov-base-int.cc @ 26399:586413770c7f