summaryrefslogtreecommitdiffstats
path: root/src/H5ACmpio.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2015-09-21 02:18:45 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2015-09-21 02:18:45 (GMT)
commit0695d6366a670e1dd9b6b0ca463feec12ab659d7 (patch)
treebaf248c43e42f8a479fb46dd21a916180575ac9b /src/H5ACmpio.c
parent68659dd411a8ca3b0b2ef86eaaa7d5ba5d5bc449 (diff)
parent8fc9a9ba251ea34ac5a943ad8eb7f6cf012b929d (diff)
downloadhdf5-0695d6366a670e1dd9b6b0ca463feec12ab659d7.zip
hdf5-0695d6366a670e1dd9b6b0ca463feec12ab659d7.tar.gz
hdf5-0695d6366a670e1dd9b6b0ca463feec12ab659d7.tar.bz2
[svn-r27835] Description:
Sync w/trunk. Tested on: MacOSX/64 10.10.5 (amazon) w/serial & parallel (h5committest not required on this branch)
Diffstat (limited to 'src/H5ACmpio.c')
-rw-r--r--src/H5ACmpio.c33
1 files changed, 2 insertions, 31 deletions
diff --git a/src/H5ACmpio.c b/src/H5ACmpio.c
index 6c2b924..fdad19a 100644
--- a/src/H5ACmpio.c
+++ b/src/H5ACmpio.c
@@ -29,11 +29,9 @@
/* Module Setup */
/****************/
-#define H5AC_PACKAGE /*suppress error about including H5ACpkg */
-#define H5F_PACKAGE /*suppress error about including H5Fpkg */
+#include "H5ACmodule.h" /* This source code file is part of the H5AC module */
+#define H5F_FRIEND /*suppress error about including H5Fpkg */
-/* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC H5AC__init_mpio_interface
/***********/
/* Headers */
@@ -135,33 +133,6 @@ H5FL_DEFINE(H5AC_aux_t);
H5FL_DEFINE_STATIC(H5AC_slist_entry_t);
-/*-------------------------------------------------------------------------
- * Function: H5AC__init_mpio_interface
- *
- * Purpose: Initialize interface-specific information
- *
- * Return: Non-negative on success/Negative on failure
- *
- * Programmer: Quincey Koziol
- * 6/20/15
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5AC__init_mpio_interface(void)
-{
- herr_t ret_value = SUCCEED; /* Return value */
-
- FUNC_ENTER_STATIC
-
- /* Funnel all work to H5AC_init() */
- if(H5AC_init() < 0)
- HGOTO_ERROR(H5E_FUNC, H5E_CANTINIT, FAIL, "interface initialization failed")
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
-} /* H5AC__init_mpio_interface() */
-
/*-------------------------------------------------------------------------
* Function: H5AC__set_sync_point_done_callback