Commit 6ad9ae50 authored by gsell's avatar gsell
Browse files

src/include/h5core/h5_types.h

- H5T_COMPOUND removed from enum h5_types_t
src/h5core/private/h5_init.c
- use H5T_COMPOUND in creation of compound types
parent 9ac7e094
...@@ -77,7 +77,7 @@ create_vertex_type ( ...@@ -77,7 +77,7 @@ create_vertex_type (
TRY( TRY(
h5_dta_types.h5_vertex_t = hdf5_create_type ( h5_dta_types.h5_vertex_t = hdf5_create_type (
H5_COMPOUND, H5T_COMPOUND,
sizeof (h5_glb_vertex_t)) ); sizeof (h5_glb_vertex_t)) );
TRY( TRY(
hdf5_insert_type ( hdf5_insert_type (
...@@ -103,7 +103,7 @@ create_triangle_type ( ...@@ -103,7 +103,7 @@ create_triangle_type (
TRY( TRY(
h5_dta_types.h5_triangle_t = hdf5_create_type ( h5_dta_types.h5_triangle_t = hdf5_create_type (
H5_COMPOUND, H5T_COMPOUND,
sizeof (h5_glb_tri_t)) ); sizeof (h5_glb_tri_t)) );
TRY( TRY(
hdf5_insert_type ( hdf5_insert_type (
...@@ -165,7 +165,7 @@ create_tag_types ( ...@@ -165,7 +165,7 @@ create_tag_types (
TRY ( TRY (
h5_dta_types.h5t_glb_tag_idx_t = hdf5_create_type ( h5_dta_types.h5t_glb_tag_idx_t = hdf5_create_type (
H5_COMPOUND, H5T_COMPOUND,
sizeof (h5t_glb_tag_idx_t)) ); sizeof (h5t_glb_tag_idx_t)) );
TRY ( TRY (
hdf5_insert_type ( hdf5_insert_type (
...@@ -191,7 +191,7 @@ create_tet_type ( ...@@ -191,7 +191,7 @@ create_tet_type (
TRY( TRY(
h5_dta_types.h5_tet_t = hdf5_create_type ( h5_dta_types.h5_tet_t = hdf5_create_type (
H5_COMPOUND, H5T_COMPOUND,
sizeof (h5_glb_tet_t)) ); sizeof (h5_glb_tet_t)) );
TRY( TRY(
hdf5_insert_type ( hdf5_insert_type (
...@@ -254,7 +254,7 @@ create_chunk_type ( ...@@ -254,7 +254,7 @@ create_chunk_type (
H5_PRIV_FUNC_ENTER (h5_err_t, "%s", "void"); H5_PRIV_FUNC_ENTER (h5_err_t, "%s", "void");
TRY( TRY(
h5_dta_types.h5_chunk_t = hdf5_create_type ( h5_dta_types.h5_chunk_t = hdf5_create_type (
H5_COMPOUND, H5T_COMPOUND,
sizeof (h5t_chunk_t)) ); sizeof (h5t_chunk_t)) );
TRY( TRY(
hdf5_insert_type ( hdf5_insert_type (
...@@ -308,7 +308,7 @@ create_octree_type ( ...@@ -308,7 +308,7 @@ create_octree_type (
H5_PRIV_FUNC_ENTER (h5_err_t, "%s", "void"); H5_PRIV_FUNC_ENTER (h5_err_t, "%s", "void");
TRY( TRY(
h5_dta_types.h5_octree_t = hdf5_create_type ( h5_dta_types.h5_octree_t = hdf5_create_type (
H5_COMPOUND, H5T_COMPOUND,
sizeof (h5t_octant_t)) ); sizeof (h5t_octant_t)) );
TRY( TRY(
hdf5_insert_type ( hdf5_insert_type (
...@@ -357,7 +357,7 @@ create_userdata_type ( ...@@ -357,7 +357,7 @@ create_userdata_type (
H5_PRIV_FUNC_ENTER (h5_err_t, "%s", "void"); H5_PRIV_FUNC_ENTER (h5_err_t, "%s", "void");
TRY( TRY(
h5_dta_types.h5_userdata_t = hdf5_create_type ( h5_dta_types.h5_userdata_t = hdf5_create_type (
H5_COMPOUND, H5T_COMPOUND,
sizeof (h5t_oct_userdata_t)) ); sizeof (h5t_oct_userdata_t)) );
TRY( TRY(
hdf5_insert_type ( hdf5_insert_type (
...@@ -663,7 +663,7 @@ _h5_exit (int status) { ...@@ -663,7 +663,7 @@ _h5_exit (int status) {
} }
h5_err_t h5_err_t
h5_initialize ( h5priv_initialize (
void void
) { ) {
h5_initialized = 1; h5_initialized = 1;
......
...@@ -13,18 +13,6 @@ ...@@ -13,18 +13,6 @@
#include <stdarg.h> #include <stdarg.h>
#include <stdint.h> #include <stdint.h>
#define H5_STRING H5T_C_S1
#define H5_INT16 H5T_NATIVE_INT16
#define H5_UINT16 H5T_NATIVE_UINT16
#define H5_INT32 H5T_NATIVE_INT32
#define H5_UINT32 H5T_NATIVE_UINT32
#define H5_INT64 H5T_NATIVE_INT64
#define H5_UINT64 H5T_NATIVE_UINT64
#define H5_FLOAT32 H5T_NATIVE_FLOAT
#define H5_FLOAT64 H5T_NATIVE_DOUBLE
#define H5_ID H5T_NATIVE_INT64
#define H5_COMPOUND H5T_COMPOUND
typedef enum { typedef enum {
H5_STRING_T, H5_STRING_T,
H5_INT16_T, H5_INT16_T,
...@@ -36,9 +24,8 @@ typedef enum { ...@@ -36,9 +24,8 @@ typedef enum {
H5_FLOAT32_T, H5_FLOAT32_T,
H5_FLOAT64_T, H5_FLOAT64_T,
H5_ID_T, H5_ID_T,
H5_COMPOUND_T
} h5_types_t; } h5_types_t;
#ifdef WIN32 #ifdef WIN32
typedef __int64 int64_t; typedef __int64 int64_t;
#endif /* WIN32 */ #endif /* WIN32 */
......
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