[svn-r24709] rename H5V to H5VM since H5V is needed in the fastforward project for

view objects.  The addition of view objects in the fastforward project
is expected to be brough into the trunk sometimes in the future, which
is why we need to make this change.

Tested Manually on Jam and Ostrich.
Tested with h5commitest - Koala with intel compilers failed, but nothing had to do with those changes.
error on Koala: error while loading shared libraries: libirng.so

7 files changed, 39 insertions, 39 deletions

diff --git a/test/earray.c b/test/earray.c
index 132913b..2d0a399 100644
--- a/test/earray.c
+++ b/test/earray.c
@@ -28,7 +28,7 @@
 
 /* Other private headers that this test requires */
 #include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5Vprivate.h"		/* Vectors and arrays 			*/
+#include "H5VMprivate.h"		/* Vectors and arrays 			*/
 
 
 /* Local macros */
@@ -250,7 +250,7 @@ init_tparam(earray_test_param_t *tparam, const H5EA_create_t *cparam)
     HDmemset(tparam, 0, sizeof(*tparam));
 
     /* Compute general information */
-    tparam->nsblks = 1 + (cparam->max_nelmts_bits - H5V_log2_of2(cparam->data_blk_min_elmts));
+    tparam->nsblks = 1 + (cparam->max_nelmts_bits - H5VM_log2_of2(cparam->data_blk_min_elmts));
 
     /* Allocate information for each super block */
     tparam->sblk_info = (H5EA_sblk_info_t *)HDmalloc(sizeof(H5EA_sblk_info_t) * tparam->nsblks);
@@ -940,7 +940,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t UNUSED *tpara
     /* Set invalid max. # of elements per data block page bits */
     if(test_cparam.idx_blk_elmts > 0) {
         HDmemcpy(&test_cparam, cparam, sizeof(test_cparam));
-        test_cparam.max_dblk_page_nelmts_bits = H5V_log2_gen((uint64_t)test_cparam.idx_blk_elmts) - 1;
+        test_cparam.max_dblk_page_nelmts_bits = H5VM_log2_gen((uint64_t)test_cparam.idx_blk_elmts) - 1;
         H5E_BEGIN_TRY {
             ea = H5EA_create(f, H5P_DATASET_XFER_DEFAULT, &test_cparam, NULL);
         } H5E_END_TRY;
@@ -1743,7 +1743,7 @@ eiter_fw_state(void *_eiter, const H5EA_create_t *cparam,
 
         /* Compute super block index for element index */
         /* (same eqn. as in H5EA__dblock_sblk_idx()) */
-        sblk_idx = H5V_log2_gen((uint64_t)(((idx - cparam->idx_blk_elmts) / cparam->data_blk_min_elmts) + 1));
+        sblk_idx = H5VM_log2_gen((uint64_t)(((idx - cparam->idx_blk_elmts) / cparam->data_blk_min_elmts) + 1));
 #ifdef QAK
 HDfprintf(stderr, "idx = %Hu, tparam->sblk_info[%u] = {%Zu, %Zu, %Hu, %Hu}\n", idx, sblk_idx, tparam->sblk_info[sblk_idx].ndblks, tparam->sblk_info[sblk_idx].dblk_nelmts, tparam->sblk_info[sblk_idx].start_idx, tparam->sblk_info[sblk_idx].start_dblk);
 #endif /* QAK */
@@ -1849,10 +1849,10 @@ eiter_rv_init(const H5EA_create_t *cparam, const earray_test_param_t *tparam,
     eiter->idx = cnt - 1;
     eiter->max = cnt - 1;
     if(cnt > cparam->idx_blk_elmts) {
-        eiter->max_sblk_idx = H5V_log2_gen((uint64_t)(((eiter->max - cparam->idx_blk_elmts) / cparam->data_blk_min_elmts) + 1));
+        eiter->max_sblk_idx = H5VM_log2_gen((uint64_t)(((eiter->max - cparam->idx_blk_elmts) / cparam->data_blk_min_elmts) + 1));
         eiter->max_nelmts = EA_NELMTS(cparam, tparam, eiter->max, eiter->max_sblk_idx);
         eiter->max_ndata_blks = EA_NDATA_BLKS(cparam, tparam, eiter->max, eiter->max_sblk_idx);
-        eiter->idx_blk_nsblks = 2 * H5V_log2_of2((uint32_t)cparam->sup_blk_min_data_ptrs);
+        eiter->idx_blk_nsblks = 2 * H5VM_log2_of2((uint32_t)cparam->sup_blk_min_data_ptrs);
     } /* end if */
     else {
         eiter->max_sblk_idx = (hsize_t)0;
@@ -1970,14 +1970,14 @@ eiter_rv_state(void *_eiter, const H5EA_create_t *cparam,
             hsize_t tmp_idx;    /* Temporary index in superblock */
             hsize_t dblk_idx;   /* Index of data block within superblock */
 
-            idx_sblk_idx = H5V_log2_gen((uint64_t)(((idx - cparam->idx_blk_elmts) / cparam->data_blk_min_elmts) + 1));
+            idx_sblk_idx = H5VM_log2_gen((uint64_t)(((idx - cparam->idx_blk_elmts) / cparam->data_blk_min_elmts) + 1));
             tmp_idx = idx - (cparam->idx_blk_elmts + tparam->sblk_info[idx_sblk_idx].start_idx);
             dblk_idx = tmp_idx / tparam->sblk_info[idx_sblk_idx].dblk_nelmts;
             if(dblk_idx > 0)
                 loc_idx = idx - tparam->sblk_info[idx_sblk_idx].dblk_nelmts;
             else
                 loc_idx = cparam->idx_blk_elmts + tparam->sblk_info[idx_sblk_idx].start_idx - 1;
-            loc_sblk_idx = H5V_log2_gen((uint64_t)(((loc_idx - cparam->idx_blk_elmts) / cparam->data_blk_min_elmts) + 1));
+            loc_sblk_idx = H5VM_log2_gen((uint64_t)(((loc_idx - cparam->idx_blk_elmts) / cparam->data_blk_min_elmts) + 1));
         } /* end else */
 #ifdef QAK
 HDfprintf(stderr, "idx = %Hu, loc_idx = %Hu, eiter->max_sblk_idx = %u, idx_sblk_idx = %u, loc_sblk_idx = %u\n", idx, loc_idx, eiter->max_sblk_idx, idx_sblk_idx, loc_sblk_idx);
@@ -2715,7 +2715,7 @@ test_skip_elmts(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam,
 
         /* Compute super block index for element index */
         /* (same eqn. as in H5EA__dblock_sblk_idx()) */
-        sblk_idx = H5V_log2_gen((uint64_t)(((idx - cparam->idx_blk_elmts) / cparam->data_blk_min_elmts) + 1));
+        sblk_idx = H5VM_log2_gen((uint64_t)(((idx - cparam->idx_blk_elmts) / cparam->data_blk_min_elmts) + 1));
         state.nelmts = (hsize_t)cparam->idx_blk_elmts + tparam->sblk_info[sblk_idx].dblk_nelmts;
         state.ndata_blks = (hsize_t)1;
         state.nsuper_blks = (hsize_t)1;
diff --git a/test/farray.c b/test/farray.c
index 2844a5d..7a79aaa 100644
--- a/test/farray.c
+++ b/test/farray.c
@@ -28,7 +28,7 @@
 
 /* Other private headers that this test requires */
 #include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5Vprivate.h"		/* Vectors and arrays 			*/
+#include "H5VMprivate.h"		/* Vectors and arrays 			*/
 
 
 /* Local macros */
diff --git a/test/fheap.c b/test/fheap.c
index e4aa137..96b0673 100644
--- a/test/fheap.c
+++ b/test/fheap.c
@@ -29,7 +29,7 @@
 /* Other private headers that this test requires */
 #include "H5Iprivate.h"		/* IDs			  		*/
 #include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Vprivate.h"		/* Vectors and arrays 			*/
+#include "H5VMprivate.h"		/* Vectors and arrays 			*/
 
 /* Max. testfile name length */
 #define FHEAP_FILENAME_LEN      1024
@@ -1574,7 +1574,7 @@ fill_all_2nd_indirect_rows(H5HF_t *fh, hid_t dxpl, size_t obj_size,
     width = DTABLE_WIDTH(fh);
 
     /* Loop over rows of 2nd level deep indirect blocks */
-    for(u = 0; u < (H5V_log2_of2(width) + 1); u++)
+    for(u = 0; u < (H5VM_log2_of2(width) + 1); u++)
         if(fill_2nd_indirect_row(fh, dxpl, (u + 1), obj_size, state, keep_ids))
             TEST_ERROR
 
@@ -1692,7 +1692,7 @@ fill_all_3rd_indirect_rows(H5HF_t *fh, hid_t dxpl, size_t obj_size,
     width = DTABLE_WIDTH(fh);
 
     /* Loop over rows of 3rd level deep indirect blocks */
-    for(u = 0; u < (H5V_log2_of2(width) + 1); u++)
+    for(u = 0; u < (H5VM_log2_of2(width) + 1); u++)
         /* Fill row of 3rd level indirect blocks */
         if(fill_3rd_indirect_row(fh, dxpl, (u + 1), obj_size, state, keep_ids))
             TEST_ERROR
@@ -1782,7 +1782,7 @@ fill_all_4th_indirect_rows(H5HF_t *fh, hid_t dxpl, size_t obj_size,
     width = DTABLE_WIDTH(fh);
 
     /* Loop over rows of 4th level deep indirect blocks */
-    for(u = 0; u < (H5V_log2_of2(width) + 1); u++) {
+    for(u = 0; u < (H5VM_log2_of2(width) + 1); u++) {
         /* Fill row of 4th level indirect blocks */
         if(fill_4th_indirect_row(fh, dxpl, (u + 1), obj_size, state, keep_ids))
             TEST_ERROR
diff --git a/test/freespace.c b/test/freespace.c
index c0df4c8..14b0f9a 100644
--- a/test/freespace.c
+++ b/test/freespace.c
@@ -26,7 +26,7 @@
 #define H5F_PACKAGE
 #include "H5Fpkg.h"
 #include "H5Iprivate.h"
-#include "H5Vprivate.h"
+#include "H5VMprivate.h"
 
 #define FILENAME_LEN	1024
 
diff --git a/test/hyperslab.c b/test/hyperslab.c
index fdeaffd..5e2c109 100644
--- a/test/hyperslab.c
+++ b/test/hyperslab.c
@@ -25,7 +25,7 @@
 #include "h5test.h"
 #include "H5private.h"
 #include "H5Eprivate.h"
-#include "H5Vprivate.h"
+#include "H5VMprivate.h"
 
 #define TEST_SMALL	0x0001
 #define TEST_MEDIUM	0x0002
@@ -137,7 +137,7 @@ print_ref(size_t nx, size_t ny, size_t nz)
 /*-------------------------------------------------------------------------
  * Function:	test_fill
  *
- * Purpose:	Tests the H5V_hyper_fill() function.
+ * Purpose:	Tests the H5VM_hyper_fill() function.
  *
  * Return:	Success:	SUCCEED
  *
@@ -226,7 +226,7 @@ test_fill(size_t nx, size_t ny, size_t nz,
                                 ref_value += fill_value * dx * dy * dz;
 
                                 /* Fill the hyperslab with some value */
-                                H5V_hyper_fill(ndims, hs_size, dst_size, dst_offset, dst, fill_value);
+                                H5VM_hyper_fill(ndims, hs_size, dst_size, dst_offset, dst, fill_value);
 
                                 /*
                                  * Sum the array and compare it to the
@@ -285,7 +285,7 @@ error:
 /*-------------------------------------------------------------------------
  * Function:	test_copy
  *
- * Purpose:	Tests H5V_hyper_copy().
+ * Purpose:	Tests H5VM_hyper_copy().
  *
  *		The NX, NY, and NZ arguments are the size for the source and
  *		destination arrays.  You may pass zero for NZ or for NY and
@@ -466,7 +466,7 @@ test_copy(int mode,
                              * Copy a hyperslab from the global array to the
                              * local array.
                              */
-                            H5V_hyper_copy(ndims, hs_size, dst_size, dst_offset, dst, src_size, src_offset, src);
+                            H5VM_hyper_copy(ndims, hs_size, dst_size, dst_offset, dst, src_size, src_offset, src);
 
                             /*
                              * Sum the destination hyperslab.  It should be
@@ -569,7 +569,7 @@ error:
 /*-------------------------------------------------------------------------
  * Function:	test_multifill
  *
- * Purpose:	Tests the H5V_stride_copy() function by using it to fill a
+ * Purpose:	Tests the H5VM_stride_copy() function by using it to fill a
  *		hyperslab by replicating a multi-byte sequence.	 This might
  *		be useful to initialize an array of structs with a default
  *		struct value, or to initialize an array of floating-point
@@ -634,7 +634,7 @@ test_multifill(size_t nx)
      * Copy the fill value into each element
      */
     size = nx;
-    H5V_stride_copy(1, (hsize_t)sizeof(double), &size, &dst_stride,
+    H5VM_stride_copy(1, (hsize_t)sizeof(double), &size, &dst_stride,
             &(dst[0].mid), &src_stride, &(fill.mid));
 
     /*
@@ -690,7 +690,7 @@ error:
 /*-------------------------------------------------------------------------
  * Function:	test_endian
  *
- * Purpose:	Tests the H5V_stride_copy() function by using it to copy an
+ * Purpose:	Tests the H5VM_stride_copy() function by using it to copy an
  *		array of integers and swap the byte ordering from little
  *		endian to big endian or vice versa depending on the hardware.
  *
@@ -733,7 +733,7 @@ test_endian(size_t nx)
     size[1] = 4;
 
     /* Copy the array */
-    H5V_stride_copy_s(2, (hsize_t)1, size, dst_stride, dst + 3, src_stride, src);
+    H5VM_stride_copy_s(2, (hsize_t)1, size, dst_stride, dst + 3, src_stride, src);
 
     /* Compare */
     for(i = 0; i < nx; i++) {
@@ -824,10 +824,10 @@ test_transpose(size_t nx, size_t ny)
 
     /* Copy and transpose */
     if(nx == ny)
-        H5V_stride_copy(2, (hsize_t)sizeof(*src), size, dst_stride, dst,
+        H5VM_stride_copy(2, (hsize_t)sizeof(*src), size, dst_stride, dst,
                 src_stride, src);
     else
-        H5V_stride_copy(2, (hsize_t)sizeof(*src), size, dst_stride, dst,
+        H5VM_stride_copy(2, (hsize_t)sizeof(*src), size, dst_stride, dst,
                 src_stride, src);
 
     /* Check */
@@ -878,7 +878,7 @@ error:
 /*-------------------------------------------------------------------------
  * Function:	test_sub_super
  *
- * Purpose:	Tests H5V_stride_copy() to reduce the resolution of an image
+ * Purpose:	Tests H5VM_stride_copy() to reduce the resolution of an image
  *		by copying half the pixels in the X and Y directions.  Then
  *		we use the small image and duplicate every pixel to result in
  *		a 2x2 square.
@@ -929,7 +929,7 @@ test_sub_super(size_t nx, size_t ny)
     dst_stride[1] = 1;
 
     /* Copy */
-    H5V_stride_copy(2, (hsize_t)sizeof(uint8_t), size, dst_stride, half,
+    H5VM_stride_copy(2, (hsize_t)sizeof(uint8_t), size, dst_stride, half,
             src_stride, full);
 
     /* Check */
@@ -978,7 +978,7 @@ test_sub_super(size_t nx, size_t ny)
     dst_stride[3] = sizeof(uint8_t);
 
     /* Copy */
-    H5V_stride_copy(4, (hsize_t)sizeof(uint8_t), size, dst_stride, twice,
+    H5VM_stride_copy(4, (hsize_t)sizeof(uint8_t), size, dst_stride, twice,
             src_stride, half);
 
     /* Check */
@@ -1038,7 +1038,7 @@ error:
 /*-------------------------------------------------------------------------
  * Function:	test_array_fill
  *
- * Purpose:	Tests H5V_array_fill routine by copying a multibyte value
+ * Purpose:	Tests H5VM_array_fill routine by copying a multibyte value
  *              (an array of ints, in our case) into all the elements of an
  *              array.
  *
@@ -1072,7 +1072,7 @@ test_array_fill(size_t lo, size_t hi)
 
     /* Fill */
     for(w = lo; w <= hi; w++) {
-        H5V_array_fill(dst, src, sizeof(src), w);
+        H5VM_array_fill(dst, src, sizeof(src), w);
 
         /* Check */
         for(u = 0; u < w; u++)
@@ -1099,7 +1099,7 @@ error:
 /*-------------------------------------------------------------------------
  * Function:	test_array_offset_n_calc
  *
- * Purpose:	Tests H5V_array_offset and H5V_array_calc routines by comparing
+ * Purpose:	Tests H5VM_array_offset and H5VM_array_calc routines by comparing
  *              computed array offsets against calculated ones and then going
  *              back to the coordinates from the offset and checking those.
  *
@@ -1149,14 +1149,14 @@ test_array_offset_n_calc(size_t n, size_t x, size_t y, size_t z)
         coords[2] = (hssize_t)(HDrandom() % x);
 
         /* Get offset of coordinate */
-        off = H5V_array_offset(ARRAY_OFFSET_NDIMS, dims, coords);
+        off = H5VM_array_offset(ARRAY_OFFSET_NDIMS, dims, coords);
 
         /* Check offset of coordinate */
         if(a[off] != off)
             TEST_ERROR
 
         /* Get coordinates of offset */
-        if(H5V_array_calc(off, ARRAY_OFFSET_NDIMS, dims, new_coords) < 0)
+        if(H5VM_array_calc(off, ARRAY_OFFSET_NDIMS, dims, new_coords) < 0)
             TEST_ERROR
 
         /* Check computed coordinates */
diff --git a/test/istore.c b/test/istore.c
index f99e835..217dfc4 100644
--- a/test/istore.c
+++ b/test/istore.c
@@ -31,7 +31,7 @@
 #include "H5Gprivate.h"
 #include "H5Oprivate.h"
 #include "H5Pprivate.h"
-#include "H5Vprivate.h"
+#include "H5VMprivate.h"
 
 const char *FILENAME[] = {
     "istore",
@@ -308,7 +308,7 @@ test_extend(hid_t f, const char *prefix,
     if((fspace=H5Dget_space(dataset)) < 0) TEST_ERROR;
 
     for (ctr = 0;
-	 H5V_vector_lt_u((unsigned)ndims, max_corner, whole_size);
+	 H5VM_vector_lt_u((unsigned)ndims, max_corner, whole_size);
 	 ctr++) {
 
 	/* Size and location */
@@ -388,9 +388,9 @@ test_extend(hid_t f, const char *prefix,
         if(H5Sclose(mspace) < 0) TEST_ERROR;
 
 	/* Write to `whole' buffer for later checking */
-	H5V_hyper_copy((unsigned)ndims, size,
+	H5VM_hyper_copy((unsigned)ndims, size,
 		       whole_size, offset, whole,	/*dst*/
-		       size, H5V_ZERO, buf);		/*src*/
+		       size, H5VM_ZERO, buf);		/*src*/
 
 	/* Update max corner */
 	for (i=0; i<(size_t)ndims; i++)
diff --git a/test/mf.c b/test/mf.c
index aacf087..93667de 100644
--- a/test/mf.c
+++ b/test/mf.c
@@ -36,7 +36,7 @@
 
 #include "H5FLprivate.h"
 #include "H5Iprivate.h"
-#include "H5Vprivate.h"
+#include "H5VMprivate.h"
 
 #define FILENAME_LEN		1024