From caf3fa51d8b4082bfa7208a68b835fa5059a78ee Mon Sep 17 00:00:00 2001 From: Elena Pourmal Date: Mon, 16 Oct 2006 17:24:33 -0500 Subject: [svn-r12765] Description: Daily tests failed for Absoft f95 compiler Solution: Failure was due to several typos in H5f90prpto.h file; fixed I also removed redundant flags from the configration files. Platforms tested: heping with f95, g95, pgf90; pommier with f95 --- config/linux-gnulibc1 | 4 ++-- config/powerpc-apple | 2 +- fortran/src/H5f90proto.h | 54 ++++++++++++++++++++++++------------------------ 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/config/linux-gnulibc1 b/config/linux-gnulibc1 index 64d5d67..675006d 100644 --- a/config/linux-gnulibc1 +++ b/config/linux-gnulibc1 @@ -86,12 +86,12 @@ case $FC_BASENAME in # f95) # Set required flag for compiling C stubs - H5_CFLAGS="$H5_CFLAGS -DH5_ABSOFT" + H5_CFLAGS="$H5_CFLAGS" F9XSUFFIXFLAG="" # We force compiler to use upper case for external names # (just in case since this should be a default EIP) - H5_FCFLAGS="$H5_FCFLAGS -YEXT_NAMES=UCS" + H5_FCFLAGS="$H5_FCFLAGS" FSEARCH_DIRS="" DEBUG_FCFLAGS="-g" PROD_FCFLAGS="-O" diff --git a/config/powerpc-apple b/config/powerpc-apple index 6870017..aad6639 100644 --- a/config/powerpc-apple +++ b/config/powerpc-apple @@ -64,7 +64,7 @@ case $FC_BASENAME in F9XSUFFIXFLAG="" # We force compiler to use upper case for external names # (just in case since this should be a default EIP) - H5_FCFLAGS="$H5_FCFLAGS -YEXT_NAMES=UCS" + H5_FCFLAGS="$H5_FCFLAGS" FSEARCH_DIRS="" DEBUG_FCFLAGS="-g" PROD_FCFLAGS="-O" diff --git a/fortran/src/H5f90proto.h b/fortran/src/H5f90proto.h index 672cda9..7c7be0f 100644 --- a/fortran/src/H5f90proto.h +++ b/fortran/src/H5f90proto.h @@ -157,7 +157,7 @@ H5_FCDLL int_f nh5sselect_select_c ( hid_t_f *space1_id , int_f *op, hid_t_f *sp # define nh5dwrite_ref_obj_c H5_FC_FUNC_(h5dwrite_ref_obj_c, H5DWRITE_REF_OBJ_C) # define nh5dwrite_ref_reg_c H5_FC_FUNC_(h5dwrite_ref_reg_c, H5DWRITE_REF_REG_C) # define nh5dwritec_c H5_FC_FUNC_(h5dwritec_c, H5DWRITEC_C) -# define nh5dwritec_s_c H5_FC_FUNC_(h5dwritec_s_c, H5DWRITEC_s_C) +# define nh5dwritec_s_c H5_FC_FUNC_(h5dwritec_s_c, H5DWRITEC_S_C) # define nh5dwritec_1_c H5_FC_FUNC_(h5dwritec_1_c, H5DWRITEC_1_C) # define nh5dwritec_2_c H5_FC_FUNC_(h5dwritec_2_c, H5DWRITEC_2_C) # define nh5dwritec_3_c H5_FC_FUNC_(h5dwritec_3_c, H5DWRITEC_3_C) @@ -194,7 +194,7 @@ H5_FCDLL int_f nh5sselect_select_c ( hid_t_f *space1_id , int_f *op, hid_t_f *sp # define nh5dread_ref_reg_c H5_FC_FUNC_(h5dread_ref_reg_c, H5DREAD_REF_REG_C) # define nh5dread_ref_obj_c H5_FC_FUNC_(h5dread_ref_obj_c, H5DREAD_REF_OBJ_C) # define nh5dreadc_c H5_FC_FUNC_(h5dreadc_c, H5DREADC_C) -# define nh5dreadc_s_c H5_FC_FUNC_(h5dreadc_s_c, H5DREADC_s_C) +# define nh5dreadc_s_c H5_FC_FUNC_(h5dreadc_s_c, H5DREADC_S_C) # define nh5dreadc_1_c H5_FC_FUNC_(h5dreadc_1_c, H5DREADC_1_C) # define nh5dreadc_2_c H5_FC_FUNC_(h5dreadc_2_c, H5DREADC_2_C) # define nh5dreadc_3_c H5_FC_FUNC_(h5dreadc_3_c, H5DREADC_3_C) @@ -404,32 +404,32 @@ H5_FCDLL int_f nh5gget_comment_c (hid_t_f *loc_id, _fcd name, int_f *namelen, si # define nh5awritec_6_c H5_FC_FUNC_(h5awritec_6_c, H5AWRITEC_6_C) # define nh5awritec_7_c H5_FC_FUNC_(h5awritec_7_c, H5AWRITEC_7_C) # define nh5aread_c H5_FC_FUNC_(h5aread_c, H5AREAD_C) -# define nh5aread_integer_s_c H5_FC_FUNC_(h5aread_integer_s_c, H5AREAD_integer_s_C) -# define nh5aread_integer_1_c H5_FC_FUNC_(h5aread_integer_1_c, H5AREAD_integer_1_C) -# define nh5aread_integer_2_c H5_FC_FUNC_(h5aread_integer_2_c, H5AREAD_integer_2_C) -# define nh5aread_integer_3_c H5_FC_FUNC_(h5aread_integer_3_c, H5AREAD_integer_3_C) -# define nh5aread_integer_4_c H5_FC_FUNC_(h5aread_integer_4_c, H5AREAD_integer_4_C) -# define nh5aread_integer_5_c H5_FC_FUNC_(h5aread_integer_5_c, H5AREAD_integer_5_C) -# define nh5aread_integer_6_c H5_FC_FUNC_(h5aread_integer_6_c, H5AREAD_integer_6_C) -# define nh5aread_integer_7_c H5_FC_FUNC_(h5aread_integer_7_c, H5AREAD_integer_7_C) -# define nh5aread_real_s_c H5_FC_FUNC_(h5aread_real_s_c, H5AREAD_real_s_C) -# define nh5aread_real_1_c H5_FC_FUNC_(h5aread_real_1_c, H5AREAD_real_1_C) -# define nh5aread_real_2_c H5_FC_FUNC_(h5aread_real_2_c, H5AREAD_real_2_C) -# define nh5aread_real_3_c H5_FC_FUNC_(h5aread_real_3_c, H5AREAD_real_3_C) -# define nh5aread_real_4_c H5_FC_FUNC_(h5aread_real_4_c, H5AREAD_real_4_C) -# define nh5aread_real_5_c H5_FC_FUNC_(h5aread_real_5_c, H5AREAD_real_5_C) -# define nh5aread_real_6_c H5_FC_FUNC_(h5aread_real_6_c, H5AREAD_real_6_C) -# define nh5aread_real_7_c H5_FC_FUNC_(h5aread_real_7_c, H5AREAD_real_7_C) -# define nh5aread_double_s_c H5_FC_FUNC_(h5aread_double_s_c, H5AREAD_double_s_C) -# define nh5aread_double_1_c H5_FC_FUNC_(h5aread_double_1_c, H5AREAD_double_1_C) -# define nh5aread_double_2_c H5_FC_FUNC_(h5aread_double_2_c, H5AREAD_double_2_C) -# define nh5aread_double_3_c H5_FC_FUNC_(h5aread_double_3_c, H5AREAD_double_3_C) -# define nh5aread_double_4_c H5_FC_FUNC_(h5aread_double_4_c, H5AREAD_double_4_C) -# define nh5aread_double_5_c H5_FC_FUNC_(h5aread_double_5_c, H5AREAD_double_5_C) -# define nh5aread_double_6_c H5_FC_FUNC_(h5aread_double_6_c, H5AREAD_double_6_C) -# define nh5aread_double_7_c H5_FC_FUNC_(h5aread_double_7_c, H5AREAD_double_7_C) +# define nh5aread_integer_s_c H5_FC_FUNC_(h5aread_integer_s_c, H5AREAD_INTEGER_S_C) +# define nh5aread_integer_1_c H5_FC_FUNC_(h5aread_integer_1_c, H5AREAD_INTEGER_1_C) +# define nh5aread_integer_2_c H5_FC_FUNC_(h5aread_integer_2_c, H5AREAD_INTEGER_2_C) +# define nh5aread_integer_3_c H5_FC_FUNC_(h5aread_integer_3_c, H5AREAD_INTEGER_3_C) +# define nh5aread_integer_4_c H5_FC_FUNC_(h5aread_integer_4_c, H5AREAD_INTEGER_4_C) +# define nh5aread_integer_5_c H5_FC_FUNC_(h5aread_integer_5_c, H5AREAD_INTEGER_5_C) +# define nh5aread_integer_6_c H5_FC_FUNC_(h5aread_integer_6_c, H5AREAD_INTEGER_6_C) +# define nh5aread_integer_7_c H5_FC_FUNC_(h5aread_integer_7_c, H5AREAD_INTEGER_7_C) +# define nh5aread_real_s_c H5_FC_FUNC_(h5aread_real_s_c, H5AREAD_REAL_S_C) +# define nh5aread_real_1_c H5_FC_FUNC_(h5aread_real_1_c, H5AREAD_REAL_1_C) +# define nh5aread_real_2_c H5_FC_FUNC_(h5aread_real_2_c, H5AREAD_REAL_2_C) +# define nh5aread_real_3_c H5_FC_FUNC_(h5aread_real_3_c, H5AREAD_REAL_3_C) +# define nh5aread_real_4_c H5_FC_FUNC_(h5aread_real_4_c, H5AREAD_REAL_4_C) +# define nh5aread_real_5_c H5_FC_FUNC_(h5aread_real_5_c, H5AREAD_REAL_5_C) +# define nh5aread_real_6_c H5_FC_FUNC_(h5aread_real_6_c, H5AREAD_REAL_6_C) +# define nh5aread_real_7_c H5_FC_FUNC_(h5aread_real_7_c, H5AREAD_REAL_7_C) +# define nh5aread_double_s_c H5_FC_FUNC_(h5aread_double_s_c, H5AREAD_DOUBLE_S_C) +# define nh5aread_double_1_c H5_FC_FUNC_(h5aread_double_1_c, H5AREAD_DOUBLE_1_C) +# define nh5aread_double_2_c H5_FC_FUNC_(h5aread_double_2_c, H5AREAD_DOUBLE_2_C) +# define nh5aread_double_3_c H5_FC_FUNC_(h5aread_double_3_c, H5AREAD_DOUBLE_3_C) +# define nh5aread_double_4_c H5_FC_FUNC_(h5aread_double_4_c, H5AREAD_DOUBLE_4_C) +# define nh5aread_double_5_c H5_FC_FUNC_(h5aread_double_5_c, H5AREAD_DOUBLE_5_C) +# define nh5aread_double_6_c H5_FC_FUNC_(h5aread_double_6_c, H5AREAD_DOUBLE_6_C) +# define nh5aread_double_7_c H5_FC_FUNC_(h5aread_double_7_c, H5AREAD_DOUBLE_7_C) # define nh5areadc_c H5_FC_FUNC_(h5areadc_c, H5AREADC_C) -# define nh5areadc_s_c H5_FC_FUNC_(h5areadc_s_c, H5AREADC_s_C) +# define nh5areadc_s_c H5_FC_FUNC_(h5areadc_s_c, H5AREADC_S_C) # define nh5areadc_1_c H5_FC_FUNC_(h5areadc_1_c, H5AREADC_1_C) # define nh5areadc_2_c H5_FC_FUNC_(h5areadc_2_c, H5AREADC_2_C) # define nh5areadc_3_c H5_FC_FUNC_(h5areadc_3_c, H5AREADC_3_C) -- cgit v0.12