[svn-r27765] Merges from trunk:

- VMS code removal: 27572

- Dataspace memory error: 27605

- Extraneous dataset flush: 27615

- Warning quieting: 27623

- Hyperslab error clarity: 27631

- Duplicate attribute macros: 27753

Tested on: koala w/ C++ and Fortran

4 files changed, 0 insertions, 46 deletions

diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c
index cfd171a..71ada53 100644
--- a/tools/lib/h5diff_array.c
+++ b/tools/lib/h5diff_array.c
@@ -6090,28 +6090,6 @@ my_isnan(dtype_t type, void *val)
         }
     }
 
-#ifdef H5_VMS
-    /* For "float" and "double" on OpenVMS/Alpha, NaN is
-    * actually a valid value of maximal value.*/
-    if(!retval)
-    {
-        if (FLT_FLOAT==type)
-        {
-            float x;
-
-            HDmemcpy(&x, val, sizeof(float));
-            retval = (x==FLT_MAX || x==-FLT_MAX);
-        } else if (FLT_DOUBLE==type) {
-            double x;
-
-            HDmemcpy(&x, val, sizeof(double));
-            retval = (x==DBL_MAX || x==-DBL_MAX);
-        } else
-        {
-            return FALSE;
-        }
-    }
-#endif /*H5_VMS*/
     h5difftrace("my_isnan finish\n");
 
     return retval;
diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c
index e2bb9cd..8b7013b 100644
--- a/tools/lib/h5tools_str.c
+++ b/tools/lib/h5tools_str.c
@@ -875,11 +875,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
                             else
                                 tempchar = (tempchar >> packed_data_offset) & packed_data_mask;
                         }
-    #ifdef H5_VMS
-                        h5tools_str_append(str, OPT(info->fmt_schar, "%hd"), tempchar);
-    #else
                         h5tools_str_append(str, OPT(info->fmt_schar, "%hhd"), tempchar);
-    #endif
                     }
                 } /* end if (sizeof(char) == nsize) */
                 else if (sizeof(int) == nsize) {
diff --git a/tools/perform/sio_standalone.h b/tools/perform/sio_standalone.h
index 4eb1ded..8f52eba 100644
--- a/tools/perform/sio_standalone.h
+++ b/tools/perform/sio_standalone.h
@@ -322,18 +322,7 @@ H5_DLL int HDrand(void);
 #define HDread(F,M,Z)           read(F,M,Z)
 #define HDreaddir(D)            readdir(D)
 #define HDrealloc(M,Z)          realloc(M,Z)
-#ifdef H5_VMS
-#ifdef __cplusplus
-extern "C" {
-#endif
-int HDremove_all(const char * fname);
-#ifdef __cplusplus
-}
-#endif
-#define HDremove(S)             HDremove_all(S)
-#else
 #define HDremove(S)             remove(S)
-#endif /*H5_VMS*/
 #define HDrename(OLD,NEW)       rename(OLD,NEW)
 #define HDrewind(F)             rewind(F)
 #define HDrewinddir(D)          rewinddir(D)
diff --git a/tools/perform/zip_perf.c b/tools/perform/zip_perf.c
index f73ba40..d025602 100644
--- a/tools/perform/zip_perf.c
+++ b/tools/perform/zip_perf.c
@@ -30,15 +30,6 @@
 
 #include <zlib.h>
 
-#ifdef VMS
-#  define unlink        delete
-#endif  /* VMS */
-
-#ifdef RISCOS
-#  define unlink        remove
-#  define fileno(file)  file->__file
-#endif  /* RISCOS */
-
 #define ONE_KB              1024
 #define ONE_MB              (ONE_KB * ONE_KB)
 #define ONE_GB              (ONE_MB * ONE_KB)