summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlbert Cheng <acheng@hdfgroup.org>2002-05-29 16:18:33 (GMT)
committerAlbert Cheng <acheng@hdfgroup.org>2002-05-29 16:18:33 (GMT)
commit1ebc181088af1edd8112a34115b2c3673eb1e5d9 (patch)
tree3dbe366c51fda84e89996106611634228874faf0
parente69e970a1c71621c39a5f5fa656a185948ed1df8 (diff)
downloadhdf5-1ebc181088af1edd8112a34115b2c3673eb1e5d9.zip
hdf5-1ebc181088af1edd8112a34115b2c3673eb1e5d9.tar.gz
hdf5-1ebc181088af1edd8112a34115b2c3673eb1e5d9.tar.bz2
[svn-r5472] Purpose:
bug fix Description: pio_info_g has been moved to the test/libh5test.a but the pio_* source files still have the old definition and declaration. Some compilers hated the duplcation. Solution: Replaced the duplication with #include h5test.h and added test/ to the include search path too. Platforms tested: eirene, modi4.
-rw-r--r--perform/Makefile.in3
-rw-r--r--perform/pio_perf.c1
-rw-r--r--perform/pio_perf.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/perform/Makefile.in b/perform/Makefile.in
index 78d36f2..46e7621 100644
--- a/perform/Makefile.in
+++ b/perform/Makefile.in
@@ -11,7 +11,8 @@ srcdir=@srcdir@
## Add include directory to the C preprocessor flags and the hdf5 library
## to the library list.
-CPPFLAGS=-I. -I$(srcdir) -I../src -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib @CPPFLAGS@
+CPPFLAGS=-I. -I$(srcdir) -I../src -I$(top_srcdir)/src -I$(top_srcdir)/test \
+ -I$(top_srcdir)/tools/lib @CPPFLAGS@
LIBHDF5=../src/libhdf5.la
LIBH5TEST=../test/libh5test.la
LIBTOOLS=../tools/lib/libh5tools.la
diff --git a/perform/pio_perf.c b/perform/pio_perf.c
index c8910d2..08bd67a 100644
--- a/perform/pio_perf.c
+++ b/perform/pio_perf.c
@@ -83,7 +83,6 @@
FILE *output; /* output file */
int comm_world_rank_g; /* my rank in MPI_COMM_RANK */
int comm_world_nprocs_g;/* num. of processes of MPI_COMM_WORLD */
-MPI_Info pio_info_g = MPI_INFO_NULL; /*MPI INFO object to run the PIO*/
MPI_Comm pio_comm_g; /* Communicator to run the PIO */
int pio_mpi_rank_g; /* MPI rank of pio_comm_g */
int pio_mpi_nprocs_g; /* Number of processes of pio_comm_g */
diff --git a/perform/pio_perf.h b/perform/pio_perf.h
index efb100d..b36dd82 100644
--- a/perform/pio_perf.h
+++ b/perform/pio_perf.h
@@ -9,6 +9,7 @@
#include "pio_timer.h"
#include "H5private.h"
+#include "h5test.h"
/* setup the dataset no fill option if this is v1.5 or more */
#if H5_VERS_MAJOR > 1 || H5_VERS_MINOR > 4
@@ -53,7 +54,6 @@ extern FILE *output; /* output file */
extern pio_time *timer_g; /* timer: global for stub functions */
extern int comm_world_rank_g; /* my rank in MPI_COMM_RANK */
extern int comm_world_nprocs_g;/* num. of processes of MPI_COMM_WORLD */
-extern MPI_Info pio_info_g; /* MPI INFO object to run the PIO */
extern MPI_Comm pio_comm_g; /* Communicator to run the PIO */
extern int pio_mpi_rank_g; /* MPI rank of pio_comm_g */
extern int pio_mpi_nprocs_g; /* number of processes of pio_comm_g */