[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

3 files changed, 17 insertions, 15 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
diff --git a/fortran/src/H5Sff.f90 b/fortran/src/H5Sff.f90
index 651c2c0..c493d46 100644
--- a/fortran/src/H5Sff.f90
+++ b/fortran/src/H5Sff.f90
@@ -1611,7 +1611,7 @@ CONTAINS
 !  !$!****s* H5S/
 !  !$!
 !  !$! NAME
-!  !$!		h5smodify_select_f
+!  !$!		h5sselect_select_f
 !  !$!
 !  !$! PURPOSE
 !  !$!	Refine a hyperslab selection with an operation
@@ -1648,7 +1648,7 @@ CONTAINS
 !  !$!
 
 !  ! SOURCE
-!  SUBROUTINE h5smodify_select_f(space1_id, operator, space2_id, &
+!  SUBROUTINE h5sselect_select_f(space1_id, operator, space2_id, &
 !  hdferr)
 !  IMPLICIT NONE
 !  INTEGER(HID_T), INTENT(INOUT) :: space1_id ! Dataspace identifier to
@@ -1668,22 +1668,22 @@ CONTAINS
 !  INTEGER, INTENT(OUT) :: hdferr     ! Error code
 
 !  INTERFACE
-!  INTEGER FUNCTION h5smodify_select_c(space1_id, operator, &
+!  INTEGER FUNCTION h5sselect_select_c(space1_id, operator, &
 !  space2_id)
 !  USE H5GLOBAL
 !  !DEC$IF DEFINED(HDF5F90_WINDOWS)
-!  !DEC$ATTRIBUTES C,reference,decorate,alias:'H5SMODIFY_SELECT_C'::h5smodify_select_c
+!  !DEC$ATTRIBUTES C,reference,decorate,alias:'H5SSELECT_SELECT_C'::h5sselect_select_c
 !  !DEC$ENDIF
 !  INTEGER(HID_T), INTENT(INOUT) :: space1_id
 !  INTEGER(HID_T), INTENT(IN) :: space2_id
 !  INTEGER, INTENT(IN) :: operator
-!  END FUNCTION h5smodify_select_c
+!  END FUNCTION h5sselect_select_c
 !  END INTERFACE
 
-!  hdferr = h5smodify_select_c(space1_id, operator, space2_id)
+!  hdferr = h5sselect_select_c(space1_id, operator, space2_id)
 !  return
 
-!  END SUBROUTINE h5smodify_select_f
+!  END SUBROUTINE h5sselect_select_f
 
 !
 !****s* H5S/h5sget_select_type_f
diff --git a/fortran/src/H5f90proto.h b/fortran/src/H5f90proto.h
index 34638ee..a0a4f64 100644
--- a/fortran/src/H5f90proto.h
+++ b/fortran/src/H5f90proto.h
@@ -143,7 +143,7 @@ H5_FCDLL int_f nh5fget_filesize_c(hid_t_f *file_id, hsize_t_f *size);
 #define nh5sselect_hyperslab_c   H5_FC_FUNC_(h5sselect_hyperslab_c, H5SSELECT_HYPERSLAB_C)
 #define nh5scombine_hyperslab_c   H5_FC_FUNC_(h5scombine_hyperslab_c, H5SCOMBINE_HYPERSLAB_C)
 #define nh5scombine_select_c   H5_FC_FUNC_(h5scombine_select_c, H5SCOMBINE_SELECT_C)
-#define nh5smodify_select_c   H5_FC_FUNC_(h5smodify_select_c, H5SMODIFY_SELECT_C)
+#define nh5sselect_select_c   H5_FC_FUNC_(h5sselect_select_c, H5SSELECT_SELECT_C)
 #define nh5sget_select_type_c   H5_FC_FUNC_(h5sget_select_type_c, H5SGET_SELECT_TYPE_C)
 #define nh5sselect_elements_c    H5_FC_FUNC_(h5sselect_elements_c, H5SSELECT_ELEMENTS_C)
 #define nh5sdecode_c    H5_FC_FUNC_(h5sdecode_c, H5SDECODE_C)
@@ -178,7 +178,7 @@ H5_FCDLL int_f nh5sget_select_type_c ( hid_t_f *space_id , int_f *op);
 H5_FCDLL int_f nh5sselect_elements_c ( hid_t_f *space_id , int_f *op, size_t_f *nelements, hsize_t_f *coord);
 H5_FCDLL int_f nh5scombine_hyperslab_c ( hid_t_f *space_id , int_f *op, hsize_t_f *start, hsize_t_f *count, hsize_t_f *stride, hsize_t_f *block, hid_t_f *hyper_id);
 H5_FCDLL int_f nh5scombine_select_c ( hid_t_f *space1_id , int_f *op, hid_t_f *space2_id, hid_t_f *ds_id);
-H5_FCDLL int_f nh5smodify_select_c ( hid_t_f *space1_id , int_f *op, hid_t_f *space2_id);
+H5_FCDLL int_f nh5sselect_select_c ( hid_t_f *space1_id , int_f *op, hid_t_f *space2_id);
 H5_FCDLL int_f nh5sdecode_c ( _fcd buf, hid_t_f *obj_id );
 H5_FCDLL int_f nh5sencode_c (_fcd buf, hid_t_f *obj_id, size_t_f *nalloc );
 H5_FCDLL int_f nh5sextent_equal_c ( hid_t_f * space1_id, hid_t_f *space2_id, hid_t_f *c_equal);