diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2014-11-03 20:13:25 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2014-11-03 20:13:25 (GMT) |
| commit | 89e2c8822ddacd982bd326be153e30fc5cbc3d3a (patch) | |
| tree | cc0adbefb22b72392b505283eda0ebb1456bf5a4 /fortran/src/H5Sf.c | |
| parent | 2fcec016a8c827cae8bb0f0caa7c74b4dc005285 (diff) | |
| download | hdf5-89e2c8822ddacd982bd326be153e30fc5cbc3d3a.zip hdf5-89e2c8822ddacd982bd326be153e30fc5cbc3d3a.tar.gz hdf5-89e2c8822ddacd982bd326be153e30fc5cbc3d3a.tar.bz2 | |
[svn-r25766] Description:
Revert r25273, 25283 & 25439 (the hyperslab improvement changes). They
are buggy and it's taking me a long time to correct the problem. I'll check
in a revised form of the changes when I've got them straightened out.
Tested on:
Mac OSX 10.10.0 (amazon) w/gcc 4.9.x, C++, FORTRAN
Linux 2.6.x (jam) w/parallel
Diffstat (limited to 'fortran/src/H5Sf.c')
| -rw-r--r-- | fortran/src/H5Sf.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/fortran/src/H5Sf.c b/fortran/src/H5Sf.c index d738fda..f6803ac 100644 --- a/fortran/src/H5Sf.c +++ b/fortran/src/H5Sf.c @@ -1002,6 +1002,8 @@ done: return ret_value; } + +#ifdef NEW_HYPERSLAB_API /****if* H5Sf/h5scombine_hyperslab_c * NAME * h5scombine_hyperslab_c @@ -1125,11 +1127,11 @@ nh5scombine_select_c ( hid_t_f *space1_id , int_f *op, hid_t_f *space2_id, hid_t ret_value = 0; return ret_value; } -/****if* H5Sf/h5smodify_select_c +/****if* H5Sf/h5sselect_select_c * NAME - * h5smodify_select_c + * h5sselect_select_c * PURPOSE - * Call H5Smodify_select + * Call H5Sselect_ select * INPUTS * space1_id - identifier of the first dataspace to modify * operator - defines how the new selection is combined @@ -1145,7 +1147,7 @@ nh5scombine_select_c ( hid_t_f *space1_id , int_f *op, hid_t_f *space2_id, hid_t */ int_f -nh5smodify_select_c ( hid_t_f *space1_id , int_f *op, hid_t_f *space2_id) +nh5sselect_select_c ( hid_t_f *space1_id , int_f *op, hid_t_f *space2_id) /******/ { int ret_value = -1; @@ -1157,11 +1159,11 @@ nh5smodify_select_c ( hid_t_f *space1_id , int_f *op, hid_t_f *space2_id) c_space1_id = (hid_t)*space1_id; c_space2_id = (hid_t)*space2_id; - if( H5Smodify_select(c_space1_id, c_op, c_space2_id)< 0) return ret_value; + if( H5Sselect_select(c_space1_id, c_op, c_space2_id)< 0) return ret_value; ret_value = 0; return ret_value; } - +#endif /*NEW_HYPERSLAB_API*/ /****if* H5Sf/h5sget_select_type_c * NAME * h5sget_select_type_c |