mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-11-27 02:10:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2274 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop

Browse Source 
* commit 'db65d57541dd766e9912fb0698210cd76107d328':
  Correct standalone function attributes
  Standalone should not use import/export attributes
This commit is contained in:
Allen Byrne 2020-01-17 13:11:21 -06:00
commit 5fadf221ba
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/lib/io_timer.h
View File

@ -28,6 +28,7 @@
#ifdef H5_HAVE_WINSOCK2_H
# include <winsock2.h>
#endif /* H5_HAVE_WINSOCK2_H */
/* The different types of timers we can have */
typedef enum timer_type_ {
HDF5_FILE_OPENCLOSE,
@ -70,10 +71,19 @@ typedef struct io_time_t {
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
#ifdef STANDALONE
io_time_t *io_time_new(clock_type t);
void io_time_destroy(io_time_t *pt);
io_time_t *io_time_set(io_time_t *pt, timer_type t, int start_stop);
double io_time_get(io_time_t *pt, timer_type t);
#else
H5TOOLS_DLL io_time_t *io_time_new(clock_type t);
H5TOOLS_DLL void io_time_destroy(io_time_t *pt);
H5TOOLS_DLL io_time_t *io_time_set(io_time_t *pt, timer_type t, int start_stop);
H5TOOLS_DLL double io_time_get(io_time_t *pt, timer_type t);
#endif
#ifdef __cplusplus
}
#endif /* __cplusplus */

4
tools/test/perform/pio_standalone.h
View File

@ -483,8 +483,8 @@ extern MPI_Info h5_io_info_g; /* MPI INFO object for IO */
#endif
#ifdef H5_HAVE_PARALLEL
H5TEST_DLL int h5_set_info_object(void);
H5TEST_DLL void h5_dump_info_object(MPI_Info info);
int h5_set_info_object(void);
void h5_dump_info_object(MPI_Info info);
#endif

4
tools/test/perform/sio_standalone.h
View File

@ -498,8 +498,8 @@ extern MPI_Info h5_io_info_g; /* MPI INFO object for IO */
#endif
#ifdef H5_HAVE_PARALLEL
H5TEST_DLL int h5_set_info_object(void);
H5TEST_DLL void h5_dump_info_object(MPI_Info info);
int h5_set_info_object(void);
void h5_dump_info_object(MPI_Info info);
#endif