From 87eae5c23839b18100ec5beb771999b8b5246906 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Fri, 17 Jun 2011 13:03:43 +0000 Subject: [PATCH] functions in 'C/H5Fed.c' are no inline --- .gitattributes | 1 - src/C/H5Fed.c | 43 ------------------------------------------- src/C/Makefile.am | 1 - src/include/H5Fed.h | 27 ++++++++++++++++++--------- 4 files changed, 18 insertions(+), 54 deletions(-) delete mode 100644 src/C/H5Fed.c diff --git a/.gitattributes b/.gitattributes index 2d967ac..64a1246 100644 --- a/.gitattributes +++ b/.gitattributes @@ -368,7 +368,6 @@ src/C++/Makefile.am -text src/C/H5.c -text src/C/H5Block.c -text src/C/H5Block_readwrite.c -text -src/C/H5Fed.c -text src/C/H5Fed_adjacency.c -text src/C/H5Fed_inquiry.c -text src/C/H5Fed_retrieve.c -text diff --git a/src/C/H5Fed.c b/src/C/H5Fed.c deleted file mode 100644 index 029c033..0000000 --- a/src/C/H5Fed.c +++ /dev/null @@ -1,43 +0,0 @@ -/* - Copyright 2007-2009 - Paul Scherrer Institut, Villigen, Switzerland; - Benedikt Oswald; - Achim Gsell - All rights reserved. - - Authors - Achim Gsell - - Warning - This code is under development. - - */ -#include "h5core/h5_core.h" -#include "H5Fed.h" - - -h5_err_t -H5FedCloseMesh ( - h5_file_t* const f - ) { - H5_API_ENTER1 (h5_err_t, "f=0x%p", f); - H5_API_RETURN (h5t_close_mesh (f)); -} - -h5_err_t -H5FedSetLevel ( - h5_file_t* const f, - const h5t_lvl_idx_t level_id - ) { - H5_API_ENTER2 (h5_err_t, "f=0x%p, level_id=%d", f, level_id); - H5_API_RETURN (h5t_set_level (f, level_id)); -} - -h5_err_t -H5FedLinkMeshToStep ( - h5_file_t* const f, - const h5_id_t mesh_id - ) { - H5_API_ENTER2 (h5_err_t, "f=0x%p, mesh_id=%lld", f, (long long)mesh_id); - H5_API_RETURN (h5_error_not_implemented ()); -} diff --git a/src/C/Makefile.am b/src/C/Makefile.am index 049f62c..f176c9d 100644 --- a/src/C/Makefile.am +++ b/src/C/Makefile.am @@ -38,7 +38,6 @@ ___lib_libH5hutC_a_SOURCES = \ H5Part.c \ H5Block.c \ H5Block_readwrite.c \ - H5Fed.c \ H5Fed_adjacency.c \ H5Fed_inquiry.c \ H5Fed_retrieve.c \ diff --git a/src/include/H5Fed.h b/src/include/H5Fed.h index 7c11000..52df7ff 100644 --- a/src/include/H5Fed.h +++ b/src/include/H5Fed.h @@ -49,22 +49,31 @@ H5FedOpenTriangleMesh ( H5_API_RETURN (h5t_open_triangle_mesh (f, mesh_id)); } -h5_err_t +static inline h5_err_t H5FedCloseMesh ( - h5_file_t * const f - ); + h5_file_t* const f + ) { + H5_API_ENTER1 (h5_err_t, "f=0x%p", f); + H5_API_RETURN (h5t_close_mesh (f)); +} -h5_err_t +static inline h5_err_t H5FedSetLevel ( - h5_file_t * f, + h5_file_t* const f, const h5t_lvl_idx_t level_id - ); + ) { + H5_API_ENTER2 (h5_err_t, "f=0x%p, level_id=%d", f, level_id); + H5_API_RETURN (h5t_set_level (f, level_id)); +} -h5_err_t +static inline h5_err_t H5FedLinkMeshToStep ( - h5_file_t * f, + h5_file_t* const f, const h5_id_t mesh_id - ); + ) { + H5_API_ENTER2 (h5_err_t, "f=0x%p, mesh_id=%lld", f, (long long)mesh_id); + H5_API_RETURN (h5_error_not_implemented ()); +} #ifdef __cplusplus }