Mercurial > octave
changeset 21211:2cf8bc5c7017
use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests
* configure.ac (HAVE_HDF5_INT2FLOAT_CONVERSIONS): AC_DEFINE here.
* ls-hdf5.cc (HAVE_HDF5_INT2FLOAT_CONVERSION): Delete definition.
* ls-hdf5.cc, ls-hdf5.h, ccolamd.cc, dmperm.cc, ov-base-int.cc,
ov-bool-mat.cc, ov-bool-sparse.cc, ov-bool.cc, ov-cell.cc,
ov-class.cc, ov-complex.cc, ov-cx-mat.cc, ov-cx-sparse.cc,
ov-fcn-handle.cc, ov-fcn-inline.cc, ov-float.cc, ov-flt-complex.cc,
ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-java.cc, ov-range.cc,
ov-re-mat.cc, ov-re-sparse.cc, ov-scalar.cc, ov-str-mat.cc,
ov-struct.cc, pt-eval.cc:
Use #if defined (HAVE_FOO) instead of #if HAVE_FOO.
line wrap: on
line diff
--- a/configure.ac Sat Feb 06 07:43:32 2016 -0500 +++ b/configure.ac Sat Feb 06 08:48:47 2016 -0500 @@ -900,6 +900,14 @@ CPPFLAGS="$save_CPPFLAGS" LIBS="$save_LIBS" +dnl Should we check for this now, or wait until some version of +dnl HDF5 actually supports this feature? +have_hdf5_int2float_conversions=no +if test "$have_hdf5_int2float_conversions" = yes; then + AC_DEFINE(HAVE_HDF5_INT2FLOAT_CONVERSIONS, 1, + [Define to 1 if/when HDF5 supports automatic conversion between integer and floating-point binary data.]) +fi + ### Check for FFTW library. Default to Fortran FFTPACK if it is not available. ## Check for FFTW header and library.
--- a/libinterp/corefcn/ls-hdf5.cc Sat Feb 06 07:43:32 2016 -0500 +++ b/libinterp/corefcn/ls-hdf5.cc Sat Feb 06 08:48:47 2016 -0500 @@ -145,10 +145,6 @@ return retval; } -// Define this to 1 if/when HDF5 supports automatic conversion between -// integer and floating-point binary data: -#define HAVE_HDF5_INT2FLOAT_CONVERSIONS 0 - // Given two compound types t1 and t2, determine whether they // are compatible for reading/writing. This function only // works for non-nested types composed of simple elements (ints, floats...), @@ -194,7 +190,7 @@ // turn off error reporting temporarily, but save the error // reporting function: -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) H5Eget_auto (octave_H5E_DEFAULT, &err_func, &err_func_data); H5Eset_auto (octave_H5E_DEFAULT, 0, 0); #else @@ -212,7 +208,7 @@ } // restore error reporting: -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) H5Eset_auto (octave_H5E_DEFAULT, err_func, err_func_data); #else H5Eset_auto (err_func, err_func_data); @@ -236,7 +232,7 @@ // turn off error reporting temporarily, but save the error // reporting function: -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) H5Eget_auto (octave_H5E_DEFAULT, &err_func, &err_func_data); H5Eset_auto (octave_H5E_DEFAULT, 0, 0); #else @@ -258,7 +254,7 @@ } // restore error reporting: -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) H5Eset_auto (octave_H5E_DEFAULT, err_func, err_func_data); #else H5Eset_auto (err_func, err_func_data); @@ -328,7 +324,7 @@ if (info.type == H5G_GROUP && ident_valid) { -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) subgroup_id = H5Gopen (group_id, name, octave_H5P_DEFAULT); #else subgroup_id = H5Gopen (group_id, name); @@ -342,7 +338,7 @@ if (hdf5_check_attr (subgroup_id, "OCTAVE_NEW_FORMAT")) { -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_id = H5Dopen (subgroup_id, "type", octave_H5P_DEFAULT); #else data_id = H5Dopen (subgroup_id, "type"); @@ -416,7 +412,7 @@ else if (info.type == H5G_DATASET && ident_valid) { // For backwards compatibility. -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_id = H5Dopen (group_id, name, octave_H5P_DEFAULT); #else data_id = H5Dopen (group_id, name); @@ -651,7 +647,7 @@ herr_t H5Giterate_retval = -1; hsize_t num_obj = 0; -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) hid_t group_id = H5Gopen (hs.file_id, "/", octave_H5P_DEFAULT); #else hid_t group_id = H5Gopen (hs.file_id, "/"); @@ -723,7 +719,7 @@ if (as_id >= 0) { -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) hid_t a_id = H5Acreate (loc_id, attr_name, H5T_NATIVE_UCHAR, as_id, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -759,7 +755,7 @@ if (as_id >= 0) { -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) hid_t a_id = H5Acreate (loc_id, attr_name, type_id, as_id, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -808,7 +804,7 @@ space_hid = H5Screate_simple (1, &sz, 0); if (space_hid < 0) return space_hid; -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_IDX, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -844,7 +840,7 @@ return 0; hsize_t hdims, maxdims; -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) hid_t data_hid = H5Dopen (loc_id, name, octave_H5P_DEFAULT); #else hid_t data_hid = H5Dopen (loc_id, name); @@ -873,7 +869,7 @@ // save_type_to_hdf5 is not currently used, since hdf5 doesn't yet support // automatic float<->integer conversions: -#if HAVE_HDF5_INT2FLOAT_CONVERSIONS +#if defined (HAVE_HDF5_INT2FLOAT_CONVERSIONS) // return the HDF5 type id corresponding to the Octave save_type @@ -934,7 +930,7 @@ val = val.full_value (); std::string t = val.type_name (); -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_id = H5Gcreate (loc_id, name.c_str (), octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -952,7 +948,7 @@ space_id = H5Screate_simple (0 , dims, 0); if (space_id < 0) goto error_cleanup; -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_type_id = H5Dcreate (data_id, "type", type_id, space_id, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else
--- a/libinterp/corefcn/ls-hdf5.h Sat Feb 06 07:43:32 2016 -0500 +++ b/libinterp/corefcn/ls-hdf5.h Sat Feb 06 08:48:47 2016 -0500 @@ -110,7 +110,7 @@ std::string doc; }; -#if HAVE_HDF5_INT2FLOAT_CONVERSIONS +#if defined (HAVE_HDF5_INT2FLOAT_CONVERSIONS) extern OCTINTERP_API octave_hdf5_id save_type_to_hdf5 (save_type st) #endif
--- a/libinterp/dldfcn/ccolamd.cc Sat Feb 06 07:43:32 2016 -0500 +++ b/libinterp/dldfcn/ccolamd.cc Sat Feb 06 08:48:47 2016 -0500 @@ -399,7 +399,7 @@ @seealso{symamd, ccolamd}\n\ @end deftypefn") { -#if HAVE_CCOLAMD +#if defined (HAVE_CCOLAMD) int nargin = args.length ();
--- a/libinterp/dldfcn/dmperm.cc Sat Feb 06 07:43:32 2016 -0500 +++ b/libinterp/dldfcn/dmperm.cc Sat Feb 06 08:48:47 2016 -0500 @@ -51,7 +51,7 @@ return ret; } -#if HAVE_CXSPARSE +#if defined (HAVE_CXSPARSE) static octave_value_list dmperm_internal (bool rank, const octave_value arg, int nargout) { @@ -136,7 +136,7 @@ @seealso{colamd, ccolamd}\n\ @end deftypefn") { -#if HAVE_CXSPARSE +#if defined (HAVE_CXSPARSE) if (args.length () != 1) print_usage (); @@ -179,7 +179,7 @@ @seealso{dmperm}\n\ @end deftypefn") { -#if HAVE_CXSPARSE +#if defined (HAVE_CXSPARSE) if (args.length () != 1) print_usage ();
--- a/libinterp/octave-value/ov-base-int.cc Sat Feb 06 07:43:32 2016 -0500 +++ b/libinterp/octave-value/ov-base-int.cc Sat Feb 06 08:48:47 2016 -0500 @@ -349,7 +349,7 @@ space_hid = H5Screate_simple (rank, hdims, 0); if (space_hid < 0) return false; -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -391,7 +391,7 @@ if (empty) return (empty > 0); -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) hid_t data_hid = H5Dopen (loc_id, name, octave_H5P_DEFAULT); #else hid_t data_hid = H5Dopen (loc_id, name); @@ -556,7 +556,7 @@ space_hid = H5Screate_simple (0, dimens, 0); if (space_hid < 0) return false; -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -589,7 +589,7 @@ #if defined (HAVE_HDF5) hid_t save_type_hid = HDF5_SAVE_TYPE; -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) hid_t data_hid = H5Dopen (loc_id, name, octave_H5P_DEFAULT); #else hid_t data_hid = H5Dopen (loc_id, name);
--- a/libinterp/octave-value/ov-bool-mat.cc Sat Feb 06 07:43:32 2016 -0500 +++ b/libinterp/octave-value/ov-bool-mat.cc Sat Feb 06 08:48:47 2016 -0500 @@ -395,7 +395,7 @@ space_hid = H5Screate_simple (rank, hdims, 0); if (space_hid < 0) return false; -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_HBOOL, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -442,7 +442,7 @@ if (empty) return (empty > 0); -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) hid_t data_hid = H5Dopen (loc_id, name, octave_H5P_DEFAULT); #else hid_t data_hid = H5Dopen (loc_id, name);
--- a/libinterp/octave-value/ov-bool-sparse.cc Sat Feb 06 07:43:32 2016 -0500 +++ b/libinterp/octave-value/ov-bool-sparse.cc Sat Feb 06 08:48:47 2016 -0500 @@ -345,7 +345,7 @@ // Ensure that additional memory is deallocated matrix.maybe_compress (); -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) hid_t group_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -366,7 +366,7 @@ H5Gclose (group_hid); return false; } -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dcreate (group_hid, "nr", H5T_NATIVE_IDX, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -391,7 +391,7 @@ return false; } -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dcreate (group_hid, "nc", H5T_NATIVE_IDX, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -416,7 +416,7 @@ return false; } -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dcreate (group_hid, "nz", H5T_NATIVE_IDX, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -454,7 +454,7 @@ return false; } -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dcreate (group_hid, "cidx", H5T_NATIVE_IDX, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -492,7 +492,7 @@ return false; } -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dcreate (group_hid, "ridx", H5T_NATIVE_IDX, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -517,7 +517,7 @@ return false; } -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dcreate (group_hid, "data", H5T_NATIVE_HBOOL, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -566,14 +566,14 @@ if (empty) return (empty > 0); -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) group_hid = H5Gopen (loc_id, name, octave_H5P_DEFAULT); #else group_hid = H5Gopen (loc_id, name); #endif if (group_hid < 0) return false; -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dopen (group_hid, "nr", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "nr"); @@ -598,7 +598,7 @@ H5Dclose (data_hid); -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dopen (group_hid, "nc", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "nc"); @@ -623,7 +623,7 @@ H5Dclose (data_hid); -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dopen (group_hid, "nz", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "nz"); @@ -652,7 +652,7 @@ static_cast<octave_idx_type> (nc), static_cast<octave_idx_type> (nz)); -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dopen (group_hid, "cidx", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "cidx"); @@ -695,7 +695,7 @@ H5Sclose (space_hid); H5Dclose (data_hid); -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dopen (group_hid, "ridx", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "ridx"); @@ -735,7 +735,7 @@ H5Sclose (space_hid); H5Dclose (data_hid); -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dopen (group_hid, "data", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "data");
--- a/libinterp/octave-value/ov-bool.cc Sat Feb 06 07:43:32 2016 -0500 +++ b/libinterp/octave-value/ov-bool.cc Sat Feb 06 08:48:47 2016 -0500 @@ -169,7 +169,7 @@ space_hid = H5Screate_simple (0, dimens, 0); if (space_hid < 0) return false; -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_DOUBLE, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -201,7 +201,7 @@ { #if defined (HAVE_HDF5) -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) hid_t data_hid = H5Dopen (loc_id, name, octave_H5P_DEFAULT); #else hid_t data_hid = H5Dopen (loc_id, name);
--- a/libinterp/octave-value/ov-cell.cc Sat Feb 06 07:43:32 2016 -0500 +++ b/libinterp/octave-value/ov-cell.cc Sat Feb 06 08:48:47 2016 -0500 @@ -976,7 +976,7 @@ hid_t space_hid, data_hid, size_hid; space_hid = data_hid = size_hid = -1; -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else data_hid = H5Gcreate (loc_id, name, 0); @@ -1002,7 +1002,7 @@ for (hsize_t i = 0; i < rank; i++) hdims[i] = dv(rank-i-1); -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) size_hid = H5Dcreate (data_hid, "dims", H5T_NATIVE_IDX, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -1076,7 +1076,7 @@ if (empty) return (empty > 0); -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) hid_t group_id = H5Gopen (loc_id, name, octave_H5P_DEFAULT); #else hid_t group_id = H5Gopen (loc_id, name); @@ -1085,7 +1085,7 @@ if (group_id < 0) return false; -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) hid_t data_hid = H5Dopen (group_id, "dims", octave_H5P_DEFAULT); #else hid_t data_hid = H5Dopen (group_id, "dims"); @@ -1133,7 +1133,7 @@ int current_item = 0; hsize_t num_obj = 0; -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) group_id = H5Gopen (loc_id, name, octave_H5P_DEFAULT); #else group_id = H5Gopen (loc_id, name);
--- a/libinterp/octave-value/ov-class.cc Sat Feb 06 07:43:32 2016 -0500 +++ b/libinterp/octave-value/ov-class.cc Sat Feb 06 08:48:47 2016 -0500 @@ -1389,7 +1389,7 @@ octave_map m; octave_map::iterator i; -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) group_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else group_hid = H5Gcreate (loc_id, name, 0); @@ -1406,7 +1406,7 @@ space_hid = H5Screate_simple (0 , hdims, 0); if (space_hid < 0) goto error_cleanup; -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) class_hid = H5Dcreate (group_hid, "classname", type_hid, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -1417,7 +1417,7 @@ octave_H5P_DEFAULT, c_name.c_str ()) < 0) goto error_cleanup; -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Gcreate (group_hid, "value", octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -1500,7 +1500,7 @@ int slen = 0; hsize_t rank = 0; -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) group_hid = H5Gopen (loc_id, name, octave_H5P_DEFAULT); #else group_hid = H5Gopen (loc_id, name); @@ -1508,7 +1508,7 @@ if (group_hid < 0) goto error_cleanup; -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dopen (group_hid, "classname", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "classname"); @@ -1561,7 +1561,7 @@ while (0); reconstruct_exemplar (); -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) subgroup_hid = H5Gopen (group_hid, name, octave_H5P_DEFAULT); #else subgroup_hid = H5Gopen (group_hid, name);
--- a/libinterp/octave-value/ov-complex.cc Sat Feb 06 07:43:32 2016 -0500 +++ b/libinterp/octave-value/ov-complex.cc Sat Feb 06 08:48:47 2016 -0500 @@ -363,7 +363,7 @@ H5Sclose (space_hid); return false; } -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dcreate (loc_id, name, type_hid, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -398,7 +398,7 @@ #if defined (HAVE_HDF5) -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) hid_t data_hid = H5Dopen (loc_id, name, octave_H5P_DEFAULT); #else hid_t data_hid = H5Dopen (loc_id, name);
--- a/libinterp/octave-value/ov-cx-mat.cc Sat Feb 06 07:43:32 2016 -0500 +++ b/libinterp/octave-value/ov-cx-mat.cc Sat Feb 06 08:48:47 2016 -0500 @@ -563,7 +563,7 @@ else save_type_hid = H5T_NATIVE_FLOAT; } -#if HAVE_HDF5_INT2FLOAT_CONVERSIONS +#if defined (HAVE_HDF5_INT2FLOAT_CONVERSIONS) // hdf5 currently doesn't support float/integer conversions else { @@ -581,7 +581,7 @@ H5Sclose (space_hid); return false; } -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dcreate (loc_id, name, type_hid, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -635,7 +635,7 @@ if (empty) return (empty > 0); -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) hid_t data_hid = H5Dopen (loc_id, name, octave_H5P_DEFAULT); #else hid_t data_hid = H5Dopen (loc_id, name);
--- a/libinterp/octave-value/ov-cx-sparse.cc Sat Feb 06 07:43:32 2016 -0500 +++ b/libinterp/octave-value/ov-cx-sparse.cc Sat Feb 06 08:48:47 2016 -0500 @@ -377,7 +377,7 @@ // Ensure that additional memory is deallocated matrix.maybe_compress (); -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) hid_t group_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -399,7 +399,7 @@ return false; } -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dcreate (group_hid, "nr", H5T_NATIVE_IDX, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -424,7 +424,7 @@ return false; } -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dcreate (group_hid, "nc", H5T_NATIVE_IDX, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -449,7 +449,7 @@ return false; } -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dcreate (group_hid, "nz", H5T_NATIVE_IDX, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -487,7 +487,7 @@ return false; } -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dcreate (group_hid, "cidx", H5T_NATIVE_IDX, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -525,7 +525,7 @@ return false; } -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dcreate (group_hid, "ridx", H5T_NATIVE_IDX, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -562,7 +562,7 @@ else save_type_hid = H5T_NATIVE_FLOAT; } -#if HAVE_HDF5_INT2FLOAT_CONVERSIONS +#if defined (HAVE_HDF5_INT2FLOAT_CONVERSIONS) // hdf5 currently doesn't support float/integer conversions else { @@ -581,7 +581,7 @@ H5Gclose (group_hid); return false; } -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dcreate (group_hid, "data", type_hid, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -635,14 +635,14 @@ if (empty) return (empty > 0); -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) group_hid = H5Gopen (loc_id, name, octave_H5P_DEFAULT); #else group_hid = H5Gopen (loc_id, name); #endif if (group_hid < 0) return false; -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dopen (group_hid, "nr", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "nr"); @@ -667,7 +667,7 @@ H5Dclose (data_hid); -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dopen (group_hid, "nc", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "nc"); @@ -692,7 +692,7 @@ H5Dclose (data_hid); -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dopen (group_hid, "nz", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "nz"); @@ -721,7 +721,7 @@ static_cast<octave_idx_type> (nc), static_cast<octave_idx_type> (nz)); -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dopen (group_hid, "cidx", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "cidx"); @@ -764,7 +764,7 @@ H5Sclose (space_hid); H5Dclose (data_hid); -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dopen (group_hid, "ridx", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "ridx"); @@ -804,7 +804,7 @@ H5Sclose (space_hid); H5Dclose (data_hid); -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dopen (group_hid, "data", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "data");
--- a/libinterp/octave-value/ov-fcn-handle.cc Sat Feb 06 07:43:32 2016 -0500 +++ b/libinterp/octave-value/ov-fcn-handle.cc Sat Feb 06 08:48:47 2016 -0500 @@ -688,7 +688,7 @@ bool retval = true; hid_t group_hid = -1; -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) group_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else group_hid = H5Gcreate (loc_id, name, 0); @@ -718,7 +718,7 @@ H5Gclose (group_hid); return false; } -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dcreate (group_hid, "nm", type_hid, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -749,7 +749,7 @@ return false; } -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dcreate (group_hid, "fcn", type_hid, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -780,7 +780,7 @@ if (as_id >= 0) { -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) hid_t a_id = H5Acreate (group_hid, "SYMBOL_TABLE", H5T_NATIVE_IDX, as_id, octave_H5P_DEFAULT, octave_H5P_DEFAULT); @@ -803,7 +803,7 @@ } else retval = false; -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Gcreate (group_hid, "symbol table", octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -848,7 +848,7 @@ H5Tclose (type_hid); type_hid = H5Tcopy (H5T_C_S1); H5Tset_size (type_hid, octaveroot.length () + 1); -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) hid_t a_id = H5Acreate (group_hid, "OCTAVEROOT", type_hid, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -885,7 +885,7 @@ type_hid = H5Tcopy (H5T_C_S1); H5Tset_size (type_hid, fpath.length () + 1); -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) a_id = H5Acreate (group_hid, "FILE", type_hid, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -925,7 +925,7 @@ hsize_t rank; int slen; -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) group_hid = H5Gopen (loc_id, name, octave_H5P_DEFAULT); #else group_hid = H5Gopen (loc_id, name); @@ -933,7 +933,7 @@ if (group_hid < 0) return false; -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dopen (group_hid, "nm", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "nm"); @@ -999,7 +999,7 @@ if (nm == anonymous) { -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dopen (group_hid, "fcn", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "fcn"); @@ -1078,7 +1078,7 @@ // turn off error reporting temporarily, but save the error // reporting function: -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) H5Eget_auto (octave_H5E_DEFAULT, &err_func, &err_func_data); H5Eset_auto (octave_H5E_DEFAULT, 0, 0); #else @@ -1097,7 +1097,7 @@ } // restore error reporting: -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) H5Eset_auto (octave_H5E_DEFAULT, err_func, err_func_data); #else H5Eset_auto (err_func, err_func_data); @@ -1119,7 +1119,7 @@ if (len > 0 && success) { hsize_t num_obj = 0; -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Gopen (group_hid, "symbol table", octave_H5P_DEFAULT); #else data_hid = H5Gopen (group_hid, "symbol table"); @@ -1184,7 +1184,7 @@ // turn off error reporting temporarily, but save the error // reporting function: -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) H5Eget_auto (octave_H5E_DEFAULT, &err_func, &err_func_data); H5Eset_auto (octave_H5E_DEFAULT, 0, 0); #else @@ -1250,7 +1250,7 @@ } // restore error reporting: -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) H5Eset_auto (octave_H5E_DEFAULT, err_func, err_func_data); #else H5Eset_auto (err_func, err_func_data);
--- a/libinterp/octave-value/ov-fcn-inline.cc Sat Feb 06 07:43:32 2016 -0500 +++ b/libinterp/octave-value/ov-fcn-inline.cc Sat Feb 06 08:48:47 2016 -0500 @@ -283,7 +283,7 @@ hid_t group_hid = -1; -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) group_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else group_hid = H5Gcreate (loc_id, name, 0); @@ -313,7 +313,7 @@ H5Gclose (group_hid); return false; } -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dcreate (group_hid, "args", H5T_NATIVE_CHAR, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -367,7 +367,7 @@ H5Gclose (group_hid); return false; } -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dcreate (group_hid, "nm", type_hid, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -391,7 +391,7 @@ return false; } -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dcreate (group_hid, "iftext", type_hid, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -428,14 +428,14 @@ hsize_t rank; int slen; -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) group_hid = H5Gopen (loc_id, name, octave_H5P_DEFAULT); #else group_hid = H5Gopen (loc_id, name); #endif if (group_hid < 0) return false; -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dopen (group_hid, "args", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "args"); @@ -475,7 +475,7 @@ for (size_t i = 0; i < hdims[1]; i++) ifargs(i) = std::string (s1 + i*hdims[0]); -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dopen (group_hid, "nm", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "nm"); @@ -537,7 +537,7 @@ H5Dclose (data_hid); nm = nm_tmp; -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dopen (group_hid, "iftext", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "iftext");
--- a/libinterp/octave-value/ov-float.cc Sat Feb 06 07:43:32 2016 -0500 +++ b/libinterp/octave-value/ov-float.cc Sat Feb 06 08:48:47 2016 -0500 @@ -194,7 +194,7 @@ space_hid = H5Screate_simple (0, dimens, 0); if (space_hid < 0) return false; -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_FLOAT, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -226,7 +226,7 @@ { #if defined (HAVE_HDF5) -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) hid_t data_hid = H5Dopen (loc_id, name, octave_H5P_DEFAULT); #else hid_t data_hid = H5Dopen (loc_id, name);
--- a/libinterp/octave-value/ov-flt-complex.cc Sat Feb 06 07:43:32 2016 -0500 +++ b/libinterp/octave-value/ov-flt-complex.cc Sat Feb 06 08:48:47 2016 -0500 @@ -314,7 +314,7 @@ H5Sclose (space_hid); return false; } -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dcreate (loc_id, name, type_hid, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -349,7 +349,7 @@ #if defined (HAVE_HDF5) -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) hid_t data_hid = H5Dopen (loc_id, name, octave_H5P_DEFAULT); #else hid_t data_hid = H5Dopen (loc_id, name);
--- a/libinterp/octave-value/ov-flt-cx-mat.cc Sat Feb 06 07:43:32 2016 -0500 +++ b/libinterp/octave-value/ov-flt-cx-mat.cc Sat Feb 06 08:48:47 2016 -0500 @@ -515,7 +515,7 @@ hid_t save_type_hid = H5T_NATIVE_FLOAT; -#if HAVE_HDF5_INT2FLOAT_CONVERSIONS +#if defined (HAVE_HDF5_INT2FLOAT_CONVERSIONS) // hdf5 currently doesn't support float/integer conversions else { @@ -533,7 +533,7 @@ H5Sclose (space_hid); return false; } -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dcreate (loc_id, name, type_hid, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -586,7 +586,7 @@ if (empty) return (empty > 0); -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) hid_t data_hid = H5Dopen (loc_id, name, octave_H5P_DEFAULT); #else hid_t data_hid = H5Dopen (loc_id, name);
--- a/libinterp/octave-value/ov-flt-re-mat.cc Sat Feb 06 07:43:32 2016 -0500 +++ b/libinterp/octave-value/ov-flt-re-mat.cc Sat Feb 06 08:48:47 2016 -0500 @@ -538,7 +538,7 @@ hid_t save_type_hid = H5T_NATIVE_FLOAT; -#if HAVE_HDF5_INT2FLOAT_CONVERSIONS +#if defined (HAVE_HDF5_INT2FLOAT_CONVERSIONS) // hdf5 currently doesn't support float/integer conversions else { @@ -549,7 +549,7 @@ = save_type_to_hdf5 (get_save_type (max_val, min_val)); } #endif -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -590,7 +590,7 @@ if (empty) return (empty > 0); -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) hid_t data_hid = H5Dopen (loc_id, name, octave_H5P_DEFAULT); #else hid_t data_hid = H5Dopen (loc_id, name);
--- a/libinterp/octave-value/ov-java.cc Sat Feb 06 07:43:32 2016 -0500 +++ b/libinterp/octave-value/ov-java.cc Sat Feb 06 08:48:47 2016 -0500 @@ -28,7 +28,7 @@ #include "error.h" #include "fpucw.h" -#if HAVE_FPU_CONTROL_H +#if defined (HAVE_FPU_CONTROL_H) # include <fpu_control.h> #endif
--- a/libinterp/octave-value/ov-range.cc Sat Feb 06 07:43:32 2016 -0500 +++ b/libinterp/octave-value/ov-range.cc Sat Feb 06 08:48:47 2016 -0500 @@ -565,7 +565,7 @@ H5Sclose (space_hid); return false; } -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dcreate (loc_id, name, type_hid, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -612,7 +612,7 @@ #if defined (HAVE_HDF5) -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) hid_t data_hid = H5Dopen (loc_id, name, octave_H5P_DEFAULT); #else hid_t data_hid = H5Dopen (loc_id, name);
--- a/libinterp/octave-value/ov-re-mat.cc Sat Feb 06 07:43:32 2016 -0500 +++ b/libinterp/octave-value/ov-re-mat.cc Sat Feb 06 08:48:47 2016 -0500 @@ -660,7 +660,7 @@ else save_type_hid = H5T_NATIVE_FLOAT; } -#if HAVE_HDF5_INT2FLOAT_CONVERSIONS +#if defined (HAVE_HDF5_INT2FLOAT_CONVERSIONS) // hdf5 currently doesn't support float/integer conversions else { @@ -672,7 +672,7 @@ } #endif -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -713,7 +713,7 @@ if (empty) return (empty > 0); -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) hid_t data_hid = H5Dopen (loc_id, name, octave_H5P_DEFAULT); #else hid_t data_hid = H5Dopen (loc_id, name);
--- a/libinterp/octave-value/ov-re-sparse.cc Sat Feb 06 07:43:32 2016 -0500 +++ b/libinterp/octave-value/ov-re-sparse.cc Sat Feb 06 08:48:47 2016 -0500 @@ -399,7 +399,7 @@ // Ensure that additional memory is deallocated matrix.maybe_compress (); -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) hid_t group_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -420,7 +420,7 @@ H5Gclose (group_hid); return false; } -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dcreate (group_hid, "nr", H5T_NATIVE_IDX, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -444,7 +444,7 @@ H5Gclose (group_hid); return false; } -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dcreate (group_hid, "nc", H5T_NATIVE_IDX, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -469,7 +469,7 @@ return false; } -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dcreate (group_hid, "nz", H5T_NATIVE_IDX, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -507,7 +507,7 @@ return false; } -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dcreate (group_hid, "cidx", H5T_NATIVE_IDX, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -544,7 +544,7 @@ H5Gclose (group_hid); return false; } -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dcreate (group_hid, "ridx", H5T_NATIVE_IDX, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -581,7 +581,7 @@ else save_type_hid = H5T_NATIVE_FLOAT; } -#if HAVE_HDF5_INT2FLOAT_CONVERSIONS +#if defined (HAVE_HDF5_INT2FLOAT_CONVERSIONS) // hdf5 currently doesn't support float/integer conversions else { @@ -593,7 +593,7 @@ } #endif -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dcreate (group_hid, "data", save_type_hid, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -639,14 +639,14 @@ if (empty) return (empty > 0); -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) group_hid = H5Gopen (loc_id, name, octave_H5P_DEFAULT); #else group_hid = H5Gopen (loc_id, name); #endif if (group_hid < 0) return false; -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dopen (group_hid, "nr", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "nr"); @@ -671,7 +671,7 @@ H5Dclose (data_hid); -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dopen (group_hid, "nc", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "nc"); @@ -696,7 +696,7 @@ H5Dclose (data_hid); -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dopen (group_hid, "nz", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "nz"); @@ -725,7 +725,7 @@ static_cast<octave_idx_type> (nc), static_cast<octave_idx_type> (nz)); -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dopen (group_hid, "cidx", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "cidx"); @@ -768,7 +768,7 @@ H5Sclose (space_hid); H5Dclose (data_hid); -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dopen (group_hid, "ridx", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "ridx"); @@ -807,7 +807,7 @@ H5Sclose (space_hid); H5Dclose (data_hid); -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dopen (group_hid, "data", octave_H5P_DEFAULT); #else data_hid = H5Dopen (group_hid, "data");
--- a/libinterp/octave-value/ov-scalar.cc Sat Feb 06 07:43:32 2016 -0500 +++ b/libinterp/octave-value/ov-scalar.cc Sat Feb 06 08:48:47 2016 -0500 @@ -211,7 +211,7 @@ space_hid = H5Screate_simple (0, dimens, 0); if (space_hid < 0) return false; -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_DOUBLE, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -243,7 +243,7 @@ { #if defined (HAVE_HDF5) -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) hid_t data_hid = H5Dopen (loc_id, name, octave_H5P_DEFAULT); #else hid_t data_hid = H5Dopen (loc_id, name);
--- a/libinterp/octave-value/ov-str-mat.cc Sat Feb 06 07:43:32 2016 -0500 +++ b/libinterp/octave-value/ov-str-mat.cc Sat Feb 06 08:48:47 2016 -0500 @@ -556,7 +556,7 @@ space_hid = H5Screate_simple (rank, hdims, 0); if (space_hid < 0) return false; -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_CHAR, space_hid, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else @@ -601,7 +601,7 @@ if (empty) return (empty > 0); -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) hid_t data_hid = H5Dopen (loc_id, name, octave_H5P_DEFAULT); #else hid_t data_hid = H5Dopen (loc_id, name);
--- a/libinterp/octave-value/ov-struct.cc Sat Feb 06 07:43:32 2016 -0500 +++ b/libinterp/octave-value/ov-struct.cc Sat Feb 06 08:48:47 2016 -0500 @@ -877,7 +877,7 @@ hid_t data_hid = -1; -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else data_hid = H5Gcreate (loc_id, name, 0); @@ -929,7 +929,7 @@ octave_map m (dim_vector (1, 1)); int current_item = 0; hsize_t num_obj = 0; -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) hid_t group_id = H5Gopen (loc_id, name, octave_H5P_DEFAULT); #else hid_t group_id = H5Gopen (loc_id, name); @@ -1474,7 +1474,7 @@ hid_t data_hid = -1; -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) data_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT); #else data_hid = H5Gcreate (loc_id, name, 0); @@ -1526,7 +1526,7 @@ octave_scalar_map m; int current_item = 0; hsize_t num_obj = 0; -#if HAVE_HDF5_18 +#if defined (HAVE_HDF5_18) hid_t group_id = H5Gopen (loc_id, name, octave_H5P_DEFAULT); #else hid_t group_id = H5Gopen (loc_id, name);
--- a/libinterp/parse-tree/pt-eval.cc Sat Feb 06 07:43:32 2016 -0500 +++ b/libinterp/parse-tree/pt-eval.cc Sat Feb 06 08:48:47 2016 -0500 @@ -297,7 +297,7 @@ octave_value rhs = expr->rvalue1 (); -#if HAVE_LLVM +#if defined (HAVE_LLVM) if (tree_jit::execute (cmd, rhs)) return; #endif @@ -1016,7 +1016,7 @@ void tree_evaluator::visit_while_command (tree_while_command& cmd) { -#if HAVE_LLVM +#if defined (HAVE_LLVM) if (tree_jit::execute (cmd)) return; #endif @@ -1055,7 +1055,7 @@ void tree_evaluator::visit_do_until_command (tree_do_until_command& cmd) { -#if HAVE_LLVM +#if defined (HAVE_LLVM) if (tree_jit::execute (cmd)) return; #endif