Commit b537edfe authored by miller86's avatar miller86

unduing hdf5 change. explicitly adding H5_USE_16_API to all HDF5 based plugins

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@4693 18c085ea-50e0-402c-830e-de6fd14e8384
parent 3bd44213
......@@ -78,7 +78,13 @@
#include <InvalidVariableException.h>
#include <TimingsManager.h>
// Don't include hdf5.h directly. visit-hdf5.h ensures we get correct API
// Define this symbol BEFORE including hdf5.h to indicate the HDF5 code
// in this file uses version 1.6 of the HDF5 API. This is harmless for
// versions of HDF5 before 1.8 and ensures correct compilation with
// version 1.8 and thereafter. When, and if, the HDF5 code in this file
// is explicitly upgraded to the 1.8 API, this symbol should be removed.
#define H5_USE_16_API
#include <hdf5.h>
#include <visit-hdf5.h>
using std::string;
......
......@@ -49,8 +49,13 @@
#include <vector>
#include <list>
// Don't include hdf5.h directly. visit-hdf5.h ensures we get correct API
#include <visit-hdf5.h>
// Define this symbol BEFORE including hdf5.h to indicate the HDF5 code
// in this file uses version 1.6 of the HDF5 API. This is harmless for
// versions of HDF5 before 1.8 and ensures correct compilation with
// version 1.8 and thereafter. When, and if, the HDF5 code in this file
// is explicitly upgraded to the 1.8 API, this symbol should be removed.
#define H5_USE_16_API
#include <hdf5.h>
struct {
int i;
......
......@@ -65,8 +65,13 @@
#include <InvalidDBTypeException.h>
#include <InvalidVariableException.h>
// Don't include hdf5.h directly. visit-hdf5.h ensures we get correct API
#include <visit-hdf5.h>
// Define this symbol BEFORE including hdf5.h to indicate the HDF5 code
// in this file uses version 1.6 of the HDF5 API. This is harmless for
// versions of HDF5 before 1.8 and ensures correct compilation with
// version 1.8 and thereafter. When, and if, the HDF5 code in this file
// is explicitly upgraded to the 1.8 API, this symbol should be removed.
#define H5_USE_16_API
#include <hdf5.h>
using std::vector;
using std::string;
......
......@@ -63,11 +63,16 @@
#include <Expression.h>
#include <DebugStream.h>
// Define this symbol BEFORE including hdf5.h to indicate the HDF5 code
// in this file uses version 1.6 of the HDF5 API. This is harmless for
// versions of HDF5 before 1.8 and ensures correct compilation with
// version 1.8 and thereafter. When, and if, the HDF5 code in this file
// is explicitly upgraded to the 1.8 API, this symbol should be removed.
#define H5_USE_16_API
#include <hdf.h>
#include <mfhdf.h>
// Don't include hdf5.h directly. visit-hdf5.h ensures we get correct API
#include <visit-hdf5.h>
#include <hdf5.h>
using std::string;
......
......@@ -73,7 +73,13 @@
#include <InvalidFilesException.h>
#include <DebugStream.h>
// Don't include hdf5.h directly. visit-hdf5.h ensures we get correct API
// Define this symbol BEFORE including hdf5.h to indicate the HDF5 code
// in this file uses version 1.6 of the HDF5 API. This is harmless for
// versions of HDF5 before 1.8 and ensures correct compilation with
// version 1.8 and thereafter. When, and if, the HDF5 code in this file
// is explicitly upgraded to the 1.8 API, this symbol should be removed.
#define H5_USE_16_API
#include <hdf5.h>
#include <visit-hdf5.h>
......
......@@ -49,8 +49,13 @@
#include <string>
#include <vector>
// Don't include hdf5.h directly. visit-hdf5.h ensures we get correct API
#include <visit-hdf5.h>
// Define this symbol BEFORE including hdf5.h to indicate the HDF5 code
// in this file uses version 1.6 of the HDF5 API. This is harmless for
// versions of HDF5 before 1.8 and ensures correct compilation with
// version 1.8 and thereafter. When, and if, the HDF5 code in this file
// is explicitly upgraded to the 1.8 API, this symbol should be removed.
#define H5_USE_16_API
#include <hdf5.h>
#include <vtkPolyData.h>
......
......@@ -54,8 +54,13 @@
#include <InvalidVariableException.h>
// Don't include hdf5.h directly. visit-hdf5.h ensures we get correct API
#include <visit-hdf5.h>
// Define this symbol BEFORE including hdf5.h to indicate the HDF5 code
// in this file uses version 1.6 of the HDF5 API. This is harmless for
// versions of HDF5 before 1.8 and ensures correct compilation with
// version 1.8 and thereafter. When, and if, the HDF5 code in this file
// is explicitly upgraded to the 1.8 API, this symbol should be removed.
#define H5_USE_16_API
#include <hdf5.h>
#include <DebugStream.h>
......
......@@ -45,8 +45,13 @@
#include <avtSTMDFileFormat.h>
// Don't include hdf5.h directly. visit-hdf5.h ensures we get correct API
#include <visit-hdf5.h>
// Define this symbol BEFORE including hdf5.h to indicate the HDF5 code
// in this file uses version 1.6 of the HDF5 API. This is harmless for
// versions of HDF5 before 1.8 and ensures correct compilation with
// version 1.8 and thereafter. When, and if, the HDF5 code in this file
// is explicitly upgraded to the 1.8 API, this symbol should be removed.
#define H5_USE_16_API
#include <hdf5.h>
using std::string;
class parallelBuffer;
......
// Don't include hdf5.h directly. visit-hdf5.h ensures we get correct API
#include <visit-hdf5.h>
// Define this symbol BEFORE including hdf5.h to indicate the HDF5 code
// in this file uses version 1.6 of the HDF5 API. This is harmless for
// versions of HDF5 before 1.8 and ensures correct compilation with
// version 1.8 and thereafter. When, and if, the HDF5 code in this file
// is explicitly upgraded to the 1.8 API, this symbol should be removed.
#define H5_USE_16_API
#include <hdf5.h>
#define MAXLENGTH 256
#define H5NIMROD_SUCCESS 0
......
......@@ -44,8 +44,13 @@
#include <avtMTSDFileFormat.h>
// Don't include hdf5.h directly. visit-hdf5.h ensures we get correct API
#include <visit-hdf5.h>
// Define this symbol BEFORE including hdf5.h to indicate the HDF5 code
// in this file uses version 1.6 of the HDF5 API. This is harmless for
// versions of HDF5 before 1.8 and ensures correct compilation with
// version 1.8 and thereafter. When, and if, the HDF5 code in this file
// is explicitly upgraded to the 1.8 API, this symbol should be removed.
#define H5_USE_16_API
#include <hdf5.h>
#include "H5utils.h"
#include <vector>
......
......@@ -231,8 +231,7 @@ VisIt_iMesh_getTagName(iMesh_Instance theMesh, iBase_TagHandle theTag)
#ifdef ITAPS_MOAB
iMesh_getTagName(theMesh, theTag, tmpName, &itapsError, sizeof(tmpName));
#elif ITAPS_GRUMMP
iMesh_getTagName(theMesh, theTag, tmpName, &itapsError, sizeof(tmpName));
//iMesh_getTagName(theMesh, theTag, tmpName, sizeof(tmpName), &itapsError);
iMesh_getTagName(theMesh, theTag, tmpName, sizeof(tmpName), &itapsError);
#endif
return string(tmpName);
}
......@@ -869,9 +868,6 @@ avtITAPS_CFileFormat::PopulateDatabaseMetaData(avtDatabaseMetaData *md)
else if (vmeshFileName[q-6] == '.' && vmeshFileName[q-5] == 'c' &&
vmeshFileName[q-4] == 'u' && vmeshFileName[q-3] == 'b')
tmpFileName = string(vmeshFileName, 0, q-4);
else if (vmeshFileName[q-6] == '.' && vmeshFileName[q-5] == 'v' &&
vmeshFileName[q-4] == 't' && vmeshFileName[q-3] == 'k')
tmpFileName = string(vmeshFileName, 0, q-4);
char dummyStr[32];
iMesh_newMesh(dummyStr, &itapsMesh, &itapsError, 0);
......
......@@ -43,8 +43,13 @@
#ifndef AVT_M3D_FILE_FORMAT_H
#define AVT_M3D_FILE_FORMAT_H
// Don't include hdf5.h directly. visit-hdf5.h ensures we get correct API
#include <visit-hdf5.h>
// Define this symbol BEFORE including hdf5.h to indicate the HDF5 code
// in this file uses version 1.6 of the HDF5 API. This is harmless for
// versions of HDF5 before 1.8 and ensures correct compilation with
// version 1.8 and thereafter. When, and if, the HDF5 code in this file
// is explicitly upgraded to the 1.8 API, this symbol should be removed.
#define H5_USE_16_API
#include <hdf5.h>
#include <avtMTMDFileFormat.h>
#include <vtkTransform.h>
......
......@@ -37,14 +37,19 @@
*****************************************************************************/
// ************************************************************************* //
// avtPFLOTRANFileFormat.h //
// avtPFLOTRANFileFormat.h //
// ************************************************************************* //
#ifndef AVT_PFLOTRAN_FILE_FORMAT_H
#define AVT_PFLOTRAN_FILE_FORMAT_H
// Don't include hdf5.h directly. visit-hdf5.h ensures we get correct API
#include <visit-hdf5.h>
// Define this symbol BEFORE including hdf5.h to indicate the HDF5 code
// in this file uses version 1.6 of the HDF5 API. This is harmless for
// versions of HDF5 before 1.8 and ensures correct compilation with
// version 1.8 and thereafter. When, and if, the HDF5 code in this file
// is explicitly upgraded to the 1.8 API, this symbol should be removed.
#define H5_USE_16_API
#include <hdf5.h>
#include <avtMTMDFileFormat.h>
#include <vector>
......
......@@ -67,7 +67,13 @@
#include <InvalidTimeStepException.h>
#include <snprintf.h>
// Don't include hdf5.h directly. visit-hdf5.h ensures we get correct API
// Define this symbol BEFORE including hdf5.h to indicate the HDF5 code
// in this file uses version 1.6 of the HDF5 API. This is harmless for
// versions of HDF5 before 1.8 and ensures correct compilation with
// version 1.8 and thereafter. When, and if, the HDF5 code in this file
// is explicitly upgraded to the 1.8 API, this symbol should be removed.
#define H5_USE_16_API
#include <hdf5.h>
#include <visit-hdf5.h>
......
......@@ -45,8 +45,13 @@
#include <avtMTSDFileFormat.h>
// Don't include hdf5.h directly. visit-hdf5.h ensures we get correct API
#include <visit-hdf5.h>
// Define this symbol BEFORE including hdf5.h to indicate the HDF5 code
// in this file uses version 1.6 of the HDF5 API. This is harmless for
// versions of HDF5 before 1.8 and ensures correct compilation with
// version 1.8 and thereafter. When, and if, the HDF5 code in this file
// is explicitly upgraded to the 1.8 API, this symbol should be removed.
#define H5_USE_16_API
#include <hdf5.h>
#include <vector>
#include <map>
......
......@@ -94,7 +94,13 @@
#include <snprintf.h>
// Don't include hdf5.h directly. visit-hdf5.h ensures we get correct API
// Define this symbol BEFORE including hdf5.h to indicate the HDF5 code
// in this file uses version 1.6 of the HDF5 API. This is harmless for
// versions of HDF5 before 1.8 and ensures correct compilation with
// version 1.8 and thereafter. When, and if, the HDF5 code in this file
// is explicitly upgraded to the 1.8 API, this symbol should be removed.
#define H5_USE_16_API
#include <hdf5.h>
#include <visit-hdf5.h>
using std::vector;
......
......@@ -50,8 +50,13 @@
#include <map>
#include <visitstream.h>
// Don't include hdf5.h directly. visit-hdf5.h ensures we get correct API
#include <visit-hdf5.h>
// Define this symbol BEFORE including hdf5.h to indicate the HDF5 code
// in this file uses version 1.6 of the HDF5 API. This is harmless for
// versions of HDF5 before 1.8 and ensures correct compilation with
// version 1.8 and thereafter. When, and if, the HDF5 code in this file
// is explicitly upgraded to the 1.8 API, this symbol should be removed.
#define H5_USE_16_API
#include <hdf5.h>
using std::string;
using std::vector;
......
......@@ -46,8 +46,13 @@
#include <avtMTSDFileFormat.h>
// Don't include hdf5.h directly. visit-hdf5.h ensures we get correct API
#include <visit-hdf5.h>
// Define this symbol BEFORE including hdf5.h to indicate the HDF5 code
// in this file uses version 1.6 of the HDF5 API. This is harmless for
// versions of HDF5 before 1.8 and ensures correct compilation with
// version 1.8 and thereafter. When, and if, the HDF5 code in this file
// is explicitly upgraded to the 1.8 API, this symbol should be removed.
#define H5_USE_16_API
#include <hdf5.h>
// ****************************************************************************
......
......@@ -63,7 +63,13 @@
#include <snprintf.h>
// Don't include hdf5.h directly. visit-hdf5.h ensures we get correct API
// Define this symbol BEFORE including hdf5.h to indicate the HDF5 code
// in this file uses version 1.6 of the HDF5 API. This is harmless for
// versions of HDF5 before 1.8 and ensures correct compilation with
// version 1.8 and thereafter. When, and if, the HDF5 code in this file
// is explicitly upgraded to the 1.8 API, this symbol should be removed.
#define H5_USE_16_API
#include <hdf5.h>
#include <visit-hdf5.h>
using std::string;
......
......@@ -49,8 +49,13 @@
#define HAVE_HDF5 ((HAVE_HDF5_H==1) && (HAVE_LIBHDF5==1))
#if HAVE_HDF5
// Don't include hdf5.h directly. visit-hdf5.h ensures we get correct API
#include <visit-hdf5.h>
// Define this symbol BEFORE including hdf5.h to indicate the HDF5 code
// in this file uses version 1.6 of the HDF5 API. This is harmless for
// versions of HDF5 before 1.8 and ensures correct compilation with
// version 1.8 and thereafter. When, and if, the HDF5 code in this file
// is explicitly upgraded to the 1.8 API, this symbol should be removed.
#define H5_USE_16_API
#include <hdf5.h>
#endif
#include <silo.h>
......
......@@ -66,8 +66,13 @@
#include <XDMFParser.h>
// Don't include hdf5.h directly. visit-hdf5.h ensures we get correct API
#include <visit-hdf5.h>
// Define this symbol BEFORE including hdf5.h to indicate the HDF5 code
// in this file uses version 1.6 of the HDF5 API. This is harmless for
// versions of HDF5 before 1.8 and ensures correct compilation with
// version 1.8 and thereafter. When, and if, the HDF5 code in this file
// is explicitly upgraded to the 1.8 API, this symbol should be removed.
#define H5_USE_16_API
#include <hdf5.h>
#include <visit-config.h>
......
......@@ -47,8 +47,13 @@
#include <XDMFParser.h>
// Don't include hdf5.h directly. visit-hdf5.h ensures we get correct API
#include <visit-hdf5.h>
// Define this symbol BEFORE including hdf5.h to indicate the HDF5 code
// in this file uses version 1.6 of the HDF5 API. This is harmless for
// versions of HDF5 before 1.8 and ensures correct compilation with
// version 1.8 and thereafter. When, and if, the HDF5 code in this file
// is explicitly upgraded to the 1.8 API, this symbol should be removed.
#define H5_USE_16_API
#include <hdf5.h>
#include <string>
#include <vector>
......
......@@ -43,12 +43,6 @@
#ifndef VISIT_HDF5_H
#define VISIT_HDF5_H
// Define this symbol BEFORE including hdf5.h to indicate we wan't the
// version 1.6 of the HDF5 API. This will permit correct compilation with
// version 1.8 of HDF5
#define H5_USE_16_API
#include <hdf5.h>
//
// Useful macro for comparing HDF5 versions
//
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment