Skip to content

Commit 303d784

Browse files
kawashima-fjkawashima-fj
authored
Merge pull request #6074 from kawashima-fj/pr/remove-c99-type-check
Remove `#if HAVE_[TYPE]` for types available in C99
2 parents 8086a34 + 4e6403a commit 303d784

File tree

11 files changed

+28
-188
lines changed

11 files changed

+28
-188
lines changed

‎config/ompi_find_mpi_aint_count_offset.m4‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,7 @@ AC_DEFUN([_OMPI_FIND_MPI_COUNT_TYPE], [
9797

9898
MPI_COUNT_TYPE=unknonwn
9999
AC_MSG_CHECKING([for type of MPI_Count])
100-
if test $ac_cv_type_long_long = yes && \
101-
test $ac_cv_sizeof_long_long -le $ac_cv_sizeof_size_t && \
100+
if test $ac_cv_sizeof_long_long -le $ac_cv_sizeof_size_t && \
102101
test $ac_cv_sizeof_long_long -ge $MPI_AINT_SIZE; then
103102
MPI_COUNT_TYPE="long long"
104103
MPI_COUNT_DATATYPE=MPI_LONG_LONG

‎configure.ac‎

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -410,28 +410,18 @@ AC_CHECK_SIZEOF(char)
410410
AC_CHECK_SIZEOF(short)
411411
AC_CHECK_SIZEOF(int)
412412
AC_CHECK_SIZEOF(long)
413-
if test "$ac_cv_type_long_long" = yes; then
414-
AC_CHECK_SIZEOF(long long)
415-
fi
413+
AC_CHECK_SIZEOF(long long)
416414
AC_CHECK_SIZEOF(float)
417415
AC_CHECK_SIZEOF(double)
418-
if test "$ac_cv_type_long_double" = yes; then
419-
AC_CHECK_SIZEOF(long double)
420-
fi
416+
AC_CHECK_SIZEOF(long double)
421417
if test "$ac_cv_type___float128" = yes; then
422418
AC_CHECK_SIZEOF(__float128)
423419
fi
424420
# We only need these types if we're building the OMPI project, but
425421
# OPAL currently doesn't protect for their lack of presence well.
426-
if test "$ac_cv_type_float__Complex" = yes; then
427-
AC_CHECK_SIZEOF(float _Complex)
428-
fi
429-
if test "$ac_cv_type_double__Complex" = yes; then
430-
AC_CHECK_SIZEOF(double _Complex)
431-
fi
432-
if test "$ac_cv_type_long_double__Complex" = yes; then
433-
AC_CHECK_SIZEOF(long double _Complex)
434-
fi
422+
AC_CHECK_SIZEOF(float _Complex)
423+
AC_CHECK_SIZEOF(double _Complex)
424+
AC_CHECK_SIZEOF(long double _Complex)
435425

436426
AC_CHECK_SIZEOF(void *)
437427
AC_CHECK_SIZEOF(size_t)
@@ -470,30 +460,20 @@ OPAL_C_GET_ALIGNMENT(short, OPAL_ALIGNMENT_SHORT)
470460
OPAL_C_GET_ALIGNMENT(wchar_t, OPAL_ALIGNMENT_WCHAR)
471461
OPAL_C_GET_ALIGNMENT(int, OPAL_ALIGNMENT_INT)
472462
OPAL_C_GET_ALIGNMENT(long, OPAL_ALIGNMENT_LONG)
473-
if test "$ac_cv_type_long_long" = yes; then
474-
OPAL_C_GET_ALIGNMENT(long long, OPAL_ALIGNMENT_LONG_LONG)
475-
fi
463+
OPAL_C_GET_ALIGNMENT(long long, OPAL_ALIGNMENT_LONG_LONG)
476464
OPAL_C_GET_ALIGNMENT(float, OPAL_ALIGNMENT_FLOAT)
477465
OPAL_C_GET_ALIGNMENT(double, OPAL_ALIGNMENT_DOUBLE)
478-
if test "$ac_cv_type_long_double" = yes; then
479-
OPAL_C_GET_ALIGNMENT(long double, OPAL_ALIGNMENT_LONG_DOUBLE)
480-
fi
466+
OPAL_C_GET_ALIGNMENT(long double, OPAL_ALIGNMENT_LONG_DOUBLE)
481467
if test "$ac_cv_type___float128" = yes; then
482468
OPAL_C_GET_ALIGNMENT(__float128, OPAL_ALIGNMENT___FLOAT128)
483469
fi
484470

485471

486472
# We only need these types if we're building the OMPI project, but
487473
# OPAL currently doesn't protect for their lack of presence well.
488-
if test "$ac_cv_type_float__Complex" = yes; then
489-
OPAL_C_GET_ALIGNMENT(float _Complex, OPAL_ALIGNMENT_FLOAT_COMPLEX)
490-
fi
491-
if test "$ac_cv_type_double__Complex" = yes; then
492-
OPAL_C_GET_ALIGNMENT(double _Complex, OPAL_ALIGNMENT_DOUBLE_COMPLEX)
493-
fi
494-
if test "$ac_cv_type_long_double__Complex" = yes; then
495-
OPAL_C_GET_ALIGNMENT(long double _Complex, OPAL_ALIGNMENT_LONG_DOUBLE_COMPLEX)
496-
fi
474+
OPAL_C_GET_ALIGNMENT(float _Complex, OPAL_ALIGNMENT_FLOAT_COMPLEX)
475+
OPAL_C_GET_ALIGNMENT(double _Complex, OPAL_ALIGNMENT_DOUBLE_COMPLEX)
476+
OPAL_C_GET_ALIGNMENT(long double _Complex, OPAL_ALIGNMENT_LONG_DOUBLE_COMPLEX)
497477

498478
OPAL_C_GET_ALIGNMENT(void *, OPAL_ALIGNMENT_VOID_P)
499479
OPAL_C_GET_ALIGNMENT(size_t, OPAL_ALIGNMENT_SIZE_T)

‎ompi/datatype/ompi_datatype_internal.h‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -559,8 +559,6 @@ extern const ompi_datatype_t* ompi_datatype_basicDatatypes[OMPI_DATATYPE_MPI_MAX
559559
#define OMPI_DATATYPE_INITIALIZER_UNSIGNED_LONG OPAL_DATATYPE_INITIALIZER_UINT16
560560
#endif
561561

562-
563-
#if HAVE_LONG_LONG
564562
#if SIZEOF_LONG_LONG == 4
565563
#define OMPI_DATATYPE_INITIALIZER_LONG_LONG_INT OPAL_DATATYPE_INITIALIZER_INT4
566564
#define OMPI_DATATYPE_INITIALIZER_UNSIGNED_LONG_LONG OPAL_DATATYPE_INITIALIZER_UINT4
@@ -572,13 +570,6 @@ extern const ompi_datatype_t* ompi_datatype_basicDatatypes[OMPI_DATATYPE_MPI_MAX
572570
#define OMPI_DATATYPE_INITIALIZER_UNSIGNED_LONG_LONG OPAL_DATATYPE_INITIALIZER_UINT16
573571
#endif
574572

575-
#else /* HAVE_LONG_LONG */
576-
577-
#define OMPI_DATATYPE_INITIALIZER_LONG_LONG_INT OPAL_DATATYPE_INIT_UNAVAILABLE (LONG_LONG_INT, OMPI_DATATYPE_FLAG_DATA_C)
578-
#define OMPI_DATATYPE_INITIALIZER_UNSIGNED_LONG_LONG OPAL_DATATYPE_INIT_UNAVAILABLE (UNSIGNED_LONG_LONG, OMPI_DATATYPE_FLAG_DATA_C)
579-
580-
#endif /* HAVE_LONG_LONG */
581-
582573
#if SIZEOF_FLOAT == 2
583574
#define OMPI_DATATYPE_INITIALIZER_FLOAT OPAL_DATATYPE_INITIALIZER_FLOAT2
584575
#elif SIZEOF_FLOAT == 4
@@ -587,7 +578,6 @@ extern const ompi_datatype_t* ompi_datatype_basicDatatypes[OMPI_DATATYPE_MPI_MAX
587578
#define OMPI_DATATYPE_INITIALIZER_FLOAT OPAL_DATATYPE_INITIALIZER_FLOAT8
588579
#endif
589580

590-
591581
#if SIZEOF_DOUBLE == 4
592582
#define OMPI_DATATYPE_INITIALIZER_DOUBLE OPAL_DATATYPE_INITIALIZER_FLOAT4
593583
#elif SIZEOF_DOUBLE == 8
@@ -598,8 +588,6 @@ extern const ompi_datatype_t* ompi_datatype_basicDatatypes[OMPI_DATATYPE_MPI_MAX
598588
#define OMPI_DATATYPE_INITIALIZER_DOUBLE OPAL_DATATYPE_INITIALIZER_FLOAT16
599589
#endif
600590

601-
602-
#if HAVE_LONG_DOUBLE
603591
#if SIZEOF_LONG_DOUBLE == 4
604592
#define OMPI_DATATYPE_INITIALIZER_LONG_DOUBLE OPAL_DATATYPE_INITIALIZER_FLOAT4
605593
#elif SIZEOF_LONG_DOUBLE == 8
@@ -610,12 +598,6 @@ extern const ompi_datatype_t* ompi_datatype_basicDatatypes[OMPI_DATATYPE_MPI_MAX
610598
#define OMPI_DATATYPE_INITIALIZER_LONG_DOUBLE OPAL_DATATYPE_INITIALIZER_FLOAT16
611599
#endif
612600

613-
#else /* HAVE_LONG_DOUBLE */
614-
615-
#define OMPI_DATATYPE_INITIALIZER_LONG_DOUBLE OMPI_DATATYPE_INIT_UNAVAILABLE(LONG_DOUBLE, OMPI_DATATYPE_FLAG_DATA_C)
616-
617-
#endif /* HAVE_LONG_DOUBLE */
618-
619601
#define OMPI_DATATYPE_INITIALIZER_PACKED OPAL_DATATYPE_INITIALIZER_UINT1
620602

621603
#define OMPI_DATATYPE_INITIALIZER_BOOL OPAL_DATATYPE_INITIALIZER_BOOL

‎ompi/datatype/ompi_datatype_module.c‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -80,20 +80,11 @@ ompi_predefined_datatype_t ompi_mpi_int = OMPI_DATATYPE_INIT_PREDEFIN
8080
ompi_predefined_datatype_t ompi_mpi_unsigned = OMPI_DATATYPE_INIT_PREDEFINED (UNSIGNED, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_INT );
8181
ompi_predefined_datatype_t ompi_mpi_long = OMPI_DATATYPE_INIT_PREDEFINED (LONG, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_INT );
8282
ompi_predefined_datatype_t ompi_mpi_unsigned_long = OMPI_DATATYPE_INIT_PREDEFINED (UNSIGNED_LONG, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_INT );
83-
#if HAVE_LONG_LONG
8483
ompi_predefined_datatype_t ompi_mpi_long_long_int = OMPI_DATATYPE_INIT_PREDEFINED (LONG_LONG_INT, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_INT );
8584
ompi_predefined_datatype_t ompi_mpi_unsigned_long_long = OMPI_DATATYPE_INIT_PREDEFINED (UNSIGNED_LONG_LONG, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_INT );
86-
#else
87-
ompi_predefined_datatype_t ompi_mpi_long_long_int = OMPI_DATATYPE_INIT_UNAVAILABLE (LONG_LONG_INT, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_INT );
88-
ompi_predefined_datatype_t ompi_mpi_unsigned_long_long = OMPI_DATATYPE_INIT_UNAVAILABLE (UNSIGNED_LONG_LONG, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_INT);
89-
#endif /* HAVE_LONG_LONG */
9085
ompi_predefined_datatype_t ompi_mpi_float = OMPI_DATATYPE_INIT_PREDEFINED (FLOAT, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_FLOAT );
9186
ompi_predefined_datatype_t ompi_mpi_double = OMPI_DATATYPE_INIT_PREDEFINED (DOUBLE, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_FLOAT );
92-
#if HAVE_LONG_DOUBLE
9387
ompi_predefined_datatype_t ompi_mpi_long_double = OMPI_DATATYPE_INIT_PREDEFINED (LONG_DOUBLE, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_FLOAT );
94-
#else
95-
ompi_predefined_datatype_t ompi_mpi_long_double = OMPI_DATATYPE_INIT_UNAVAILABLE (LONG_DOUBLE, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_FLOAT );
96-
#endif /* HAVE_LONG_DOUBLE */
9788
#if defined(OPAL_ALIGNMENT_WCHAR) && OPAL_ALIGNMENT_WCHAR != 0
9889
ompi_predefined_datatype_t ompi_mpi_wchar = OMPI_DATATYPE_INIT_PREDEFINED (WCHAR, OMPI_DATATYPE_FLAG_DATA_C );
9990
#else
@@ -113,11 +104,7 @@ ompi_predefined_datatype_t ompi_mpi_cxx_bool = OMPI_DATATYPE_INIT_PREDEFIN
113104
ompi_predefined_datatype_t ompi_mpi_c_float_complex = OMPI_DATATYPE_INIT_PREDEFINED_BASIC_TYPE (C_FLOAT_COMPLEX, C_COMPLEX, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_COMPLEX );
114105
ompi_predefined_datatype_t ompi_mpi_c_complex = OMPI_DATATYPE_INIT_PREDEFINED_BASIC_TYPE (C_FLOAT_COMPLEX, C_COMPLEX, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_COMPLEX );
115106
ompi_predefined_datatype_t ompi_mpi_c_double_complex = OMPI_DATATYPE_INIT_PREDEFINED (C_DOUBLE_COMPLEX, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_COMPLEX );
116-
#if HAVE_LONG_DOUBLE
117107
ompi_predefined_datatype_t ompi_mpi_c_long_double_complex = OMPI_DATATYPE_INIT_PREDEFINED (C_LONG_DOUBLE_COMPLEX, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_COMPLEX );
118-
#else
119-
ompi_predefined_datatype_t ompi_mpi_c_long_double_complex = OMPI_DATATYPE_INIT_UNAVAILABLE (C_LONG_DOUBLE_COMPLEX, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_COMPLEX );
120-
#endif /* HAVE_LONG_DOUBLE */
121108

122109
/* The C++ complex datatypes are the same as the C datatypes */
123110
ompi_predefined_datatype_t ompi_mpi_cxx_cplex = OMPI_DATATYPE_INIT_PREDEFINED_BASIC_TYPE (C_FLOAT_COMPLEX, CXX_FLOAT_COMPLEX, OMPI_DATATYPE_FLAG_DATA_CPP | OMPI_DATATYPE_FLAG_DATA_COMPLEX );
@@ -137,7 +124,7 @@ ompi_predefined_datatype_t ompi_mpi_dblcplex = OMPI_DATATYPE_INIT_UNAVAILA
137124
#endif
138125

139126
/* In Fortran, there does not exist a type LONG DOUBLE COMPLEX, but DOUBLE COMPLEX(KIND=8) may require this */
140-
#if HAVE_LONG_DOUBLE && OMPI_HAVE_FORTRAN_DOUBLE_COMPLEX
127+
#if OMPI_HAVE_FORTRAN_DOUBLE_COMPLEX
141128
ompi_predefined_datatype_t ompi_mpi_ldblcplex = OMPI_DATATYPE_INIT_PREDEFINED_BASIC_TYPE (C_LONG_DOUBLE_COMPLEX, LONG_DOUBLE_COMPLEX, OMPI_DATATYPE_FLAG_DATA_FORTRAN | OMPI_DATATYPE_FLAG_DATA_COMPLEX );
142129
#else
143130
ompi_predefined_datatype_t ompi_mpi_ldblcplex = OMPI_DATATYPE_INIT_UNAVAILABLE (LONG_DOUBLE_COMPLEX, OMPI_DATATYPE_FLAG_DATA_FORTRAN | OMPI_DATATYPE_FLAG_DATA_COMPLEX );
@@ -174,11 +161,7 @@ ompi_predefined_datatype_t ompi_mpi_dblprec = OMPI_DATATYPE_INIT_PREDEFIN
174161
/* Aggregate struct datatypes are not const */
175162
ompi_predefined_datatype_t ompi_mpi_float_int = OMPI_DATATYPE_INIT_DEFER (FLOAT_INT, OMPI_DATATYPE_FLAG_DATA_C );
176163
ompi_predefined_datatype_t ompi_mpi_double_int = OMPI_DATATYPE_INIT_DEFER (DOUBLE_INT, OMPI_DATATYPE_FLAG_DATA_C );
177-
#if HAVE_LONG_DOUBLE
178164
ompi_predefined_datatype_t ompi_mpi_longdbl_int = OMPI_DATATYPE_INIT_DEFER (LONG_DOUBLE_INT, OMPI_DATATYPE_FLAG_DATA_C );
179-
#else
180-
ompi_predefined_datatype_t ompi_mpi_longdbl_int = OMPI_DATATYPE_INIT_UNAVAILABLE (LONG_DOUBLE_INT, OMPI_DATATYPE_FLAG_DATA_C );
181-
#endif /* HAVE_LONG_DOUBLE */
182165

183166
ompi_predefined_datatype_t ompi_mpi_2int = OMPI_DATATYPE_INIT_DEFER (2INT, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_INT );
184167
ompi_predefined_datatype_t ompi_mpi_short_int = OMPI_DATATYPE_INIT_DEFER (SHORT_INT, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_INT );

‎ompi/mca/op/base/op_base_functions.c‎

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,7 @@ FUNC_FUNC(max, fortran_integer16, ompi_fortran_integer16_t)
139139
/* Floating point */
140140
FUNC_FUNC(max, float, float)
141141
FUNC_FUNC(max, double, double)
142-
#if HAVE_LONG_DOUBLE
143142
FUNC_FUNC(max, long_double, long double)
144-
#endif
145143
#if OMPI_HAVE_FORTRAN_REAL
146144
FUNC_FUNC(max, fortran_real, ompi_fortran_real_t)
147145
#endif
@@ -199,9 +197,7 @@ FUNC_FUNC(min, fortran_integer16, ompi_fortran_integer16_t)
199197
/* Floating point */
200198
FUNC_FUNC(min, float, float)
201199
FUNC_FUNC(min, double, double)
202-
#if HAVE_LONG_DOUBLE
203200
FUNC_FUNC(min, long_double, long double)
204-
#endif
205201
#if OMPI_HAVE_FORTRAN_REAL
206202
FUNC_FUNC(min, fortran_real, ompi_fortran_real_t)
207203
#endif
@@ -256,9 +252,7 @@ OP_FUNC(sum, fortran_integer16, ompi_fortran_integer16_t, +=)
256252
/* Floating point */
257253
OP_FUNC(sum, float, float, +=)
258254
OP_FUNC(sum, double, double, +=)
259-
#if HAVE_LONG_DOUBLE
260255
OP_FUNC(sum, long_double, long double, +=)
261-
#endif
262256
#if OMPI_HAVE_FORTRAN_REAL
263257
OP_FUNC(sum, fortran_real, ompi_fortran_real_t, +=)
264258
#endif
@@ -278,15 +272,9 @@ OP_FUNC(sum, fortran_real8, ompi_fortran_real8_t, +=)
278272
OP_FUNC(sum, fortran_real16, ompi_fortran_real16_t, +=)
279273
#endif
280274
/* Complex */
281-
#if HAVE_FLOAT__COMPLEX
282275
OP_FUNC(sum, c_float_complex, float _Complex, +=)
283-
#endif
284-
#if HAVE_DOUBLE__COMPLEX
285276
OP_FUNC(sum, c_double_complex, double _Complex, +=)
286-
#endif
287-
#if HAVE_LONG_DOUBLE__COMPLEX
288277
OP_FUNC(sum, c_long_double_complex, long double _Complex, +=)
289-
#endif
290278

291279
/*************************************************************************
292280
* Product
@@ -323,9 +311,7 @@ OP_FUNC(prod, fortran_integer16, ompi_fortran_integer16_t, *=)
323311
/* Floating point */
324312
OP_FUNC(prod, float, float, *=)
325313
OP_FUNC(prod, double, double, *=)
326-
#if HAVE_LONG_DOUBLE
327314
OP_FUNC(prod, long_double, long double, *=)
328-
#endif
329315
#if OMPI_HAVE_FORTRAN_REAL
330316
OP_FUNC(prod, fortran_real, ompi_fortran_real_t, *=)
331317
#endif
@@ -345,15 +331,9 @@ OP_FUNC(prod, fortran_real8, ompi_fortran_real8_t, *=)
345331
OP_FUNC(prod, fortran_real16, ompi_fortran_real16_t, *=)
346332
#endif
347333
/* Complex */
348-
#if HAVE_FLOAT__COMPLEX
349334
OP_FUNC(prod, c_float_complex, float _Complex, *=)
350-
#endif
351-
#if HAVE_DOUBLE__COMPLEX
352335
OP_FUNC(prod, c_double_complex, double _Complex, *=)
353-
#endif
354-
#if HAVE_LONG_DOUBLE__COMPLEX
355336
OP_FUNC(prod, c_long_double_complex, long double _Complex, *=)
356-
#endif
357337

358338
/*************************************************************************
359339
* Logical AND
@@ -550,9 +530,7 @@ LOC_STRUCT(double_int, double, int)
550530
LOC_STRUCT(long_int, long, int)
551531
LOC_STRUCT(2int, int, int)
552532
LOC_STRUCT(short_int, short, int)
553-
#if HAVE_LONG_DOUBLE
554533
LOC_STRUCT(long_double_int, long double, int)
555-
#endif
556534

557535
/*************************************************************************
558536
* Max location
@@ -572,9 +550,7 @@ LOC_FUNC(maxloc, double_int, >)
572550
LOC_FUNC(maxloc, long_int, >)
573551
LOC_FUNC(maxloc, 2int, >)
574552
LOC_FUNC(maxloc, short_int, >)
575-
#if HAVE_LONG_DOUBLE
576553
LOC_FUNC(maxloc, long_double_int, >)
577-
#endif
578554

579555
/*************************************************************************
580556
* Min location
@@ -594,9 +570,7 @@ LOC_FUNC(minloc, double_int, <)
594570
LOC_FUNC(minloc, long_int, <)
595571
LOC_FUNC(minloc, 2int, <)
596572
LOC_FUNC(minloc, short_int, <)
597-
#if HAVE_LONG_DOUBLE
598573
LOC_FUNC(minloc, long_double_int, <)
599-
#endif
600574

601575

602576
/*
@@ -719,9 +693,7 @@ FUNC_FUNC_3BUF(max, fortran_integer16, ompi_fortran_integer16_t)
719693
/* Floating point */
720694
FUNC_FUNC_3BUF(max, float, float)
721695
FUNC_FUNC_3BUF(max, double, double)
722-
#if HAVE_LONG_DOUBLE
723696
FUNC_FUNC_3BUF(max, long_double, long double)
724-
#endif
725697
#if OMPI_HAVE_FORTRAN_REAL
726698
FUNC_FUNC_3BUF(max, fortran_real, ompi_fortran_real_t)
727699
#endif
@@ -779,9 +751,7 @@ FUNC_FUNC_3BUF(min, fortran_integer16, ompi_fortran_integer16_t)
779751
/* Floating point */
780752
FUNC_FUNC_3BUF(min, float, float)
781753
FUNC_FUNC_3BUF(min, double, double)
782-
#if HAVE_LONG_DOUBLE
783754
FUNC_FUNC_3BUF(min, long_double, long double)
784-
#endif
785755
#if OMPI_HAVE_FORTRAN_REAL
786756
FUNC_FUNC_3BUF(min, fortran_real, ompi_fortran_real_t)
787757
#endif
@@ -836,9 +806,7 @@ OP_FUNC_3BUF(sum, fortran_integer16, ompi_fortran_integer16_t, +)
836806
/* Floating point */
837807
OP_FUNC_3BUF(sum, float, float, +)
838808
OP_FUNC_3BUF(sum, double, double, +)
839-
#if HAVE_LONG_DOUBLE
840809
OP_FUNC_3BUF(sum, long_double, long double, +)
841-
#endif
842810
#if OMPI_HAVE_FORTRAN_REAL
843811
OP_FUNC_3BUF(sum, fortran_real, ompi_fortran_real_t, +)
844812
#endif
@@ -858,15 +826,9 @@ OP_FUNC_3BUF(sum, fortran_real8, ompi_fortran_real8_t, +)
858826
OP_FUNC_3BUF(sum, fortran_real16, ompi_fortran_real16_t, +)
859827
#endif
860828
/* Complex */
861-
#if HAVE_FLOAT__COMPLEX
862829
OP_FUNC_3BUF(sum, c_float_complex, float _Complex, +)
863-
#endif
864-
#if HAVE_DOUBLE__COMPLEX
865830
OP_FUNC_3BUF(sum, c_double_complex, double _Complex, +)
866-
#endif
867-
#if HAVE_LONG_DOUBLE__COMPLEX
868831
OP_FUNC_3BUF(sum, c_long_double_complex, long double _Complex, +)
869-
#endif
870832

871833
/*************************************************************************
872834
* Product
@@ -903,9 +865,7 @@ OP_FUNC_3BUF(prod, fortran_integer16, ompi_fortran_integer16_t, *)
903865
/* Floating point */
904866
OP_FUNC_3BUF(prod, float, float, *)
905867
OP_FUNC_3BUF(prod, double, double, *)
906-
#if HAVE_LONG_DOUBLE
907868
OP_FUNC_3BUF(prod, long_double, long double, *)
908-
#endif
909869
#if OMPI_HAVE_FORTRAN_REAL
910870
OP_FUNC_3BUF(prod, fortran_real, ompi_fortran_real_t, *)
911871
#endif
@@ -925,15 +885,9 @@ OP_FUNC_3BUF(prod, fortran_real8, ompi_fortran_real8_t, *)
925885
OP_FUNC_3BUF(prod, fortran_real16, ompi_fortran_real16_t, *)
926886
#endif
927887
/* Complex */
928-
#if HAVE_FLOAT__COMPLEX
929888
OP_FUNC_3BUF(prod, c_float_complex, float _Complex, *)
930-
#endif
931-
#if HAVE_DOUBLE__COMPLEX
932889
OP_FUNC_3BUF(prod, c_double_complex, double _Complex, *)
933-
#endif
934-
#if HAVE_LONG_DOUBLE__COMPLEX
935890
OP_FUNC_3BUF(prod, c_long_double_complex, long double _Complex, *)
936-
#endif
937891

938892
/*************************************************************************
939893
* Logical AND
@@ -1131,9 +1085,7 @@ LOC_STRUCT_3BUF(double_int, double, int)
11311085
LOC_STRUCT_3BUF(long_int, long, int)
11321086
LOC_STRUCT_3BUF(2int, int, int)
11331087
LOC_STRUCT_3BUF(short_int, short, int)
1134-
#if HAVE_LONG_DOUBLE
11351088
LOC_STRUCT_3BUF(long_double_int, long double, int)
1136-
#endif
11371089
*/
11381090

11391091
/*************************************************************************
@@ -1154,9 +1106,7 @@ LOC_FUNC_3BUF(maxloc, double_int, >)
11541106
LOC_FUNC_3BUF(maxloc, long_int, >)
11551107
LOC_FUNC_3BUF(maxloc, 2int, >)
11561108
LOC_FUNC_3BUF(maxloc, short_int, >)
1157-
#if HAVE_LONG_DOUBLE
11581109
LOC_FUNC_3BUF(maxloc, long_double_int, >)
1159-
#endif
11601110

11611111
/*************************************************************************
11621112
* Min location
@@ -1176,9 +1126,7 @@ LOC_FUNC_3BUF(minloc, double_int, <)
11761126
LOC_FUNC_3BUF(minloc, long_int, <)
11771127
LOC_FUNC_3BUF(minloc, 2int, <)
11781128
LOC_FUNC_3BUF(minloc, short_int, <)
1179-
#if HAVE_LONG_DOUBLE
11801129
LOC_FUNC_3BUF(minloc, long_double_int, <)
1181-
#endif
11821130

11831131
/*
11841132
* Helpful defines, because there's soooo many names!

0 commit comments

Comments
 (0)