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

annotate libinterp/octave-value/ov-base-int.cc @ 28826:0b5b223f6d93 stable

avoid warnings from template specializations that won't be used * ov-base-int.cc (octave_base_int_scalar<T>::load_binary): Don't switch on result of byte_size(). Only one byte_size<T> template specialization is needed, so use byte_size<sizeof (T)> instead.

author	John W. Eaton <jwe@octave.org>
date	Tue, 29 Sep 2020 17:21:34 -0400
parents	bd51beb6205e
children	0a5b15007766

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

Mercurial > octave

annotate libinterp/octave-value/ov-base-int.cc @ 28826:0b5b223f6d93 stable