Skip to content

Commit bdaa0f3

Browse files
gpaulsengpaulsen
authored
Merge pull request #10539 from devreal/op-func-unsigned-long-v4.0.x
Op: Treat unsigned long as unsigned, not signed long [v4.0.x]
2 parents 448b374 + 9903fe0 commit bdaa0f3

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ FUNC_FUNC(max, uint32_t, uint32_t)
118118
FUNC_FUNC(max, int64_t, int64_t)
119119
FUNC_FUNC(max, uint64_t, uint64_t)
120120
FUNC_FUNC(max, long, long)
121-
FUNC_FUNC(max, unsigned_long, long)
121+
FUNC_FUNC(max, unsigned_long, unsigned long)
122122

123123
/* Fortran integer */
124124
#if OMPI_HAVE_FORTRAN_INTEGER
@@ -181,7 +181,7 @@ FUNC_FUNC(min, uint32_t, uint32_t)
181181
FUNC_FUNC(min, int64_t, int64_t)
182182
FUNC_FUNC(min, uint64_t, uint64_t)
183183
FUNC_FUNC(min, long, long)
184-
FUNC_FUNC(min, unsigned_long, long)
184+
FUNC_FUNC(min, unsigned_long, unsigned long)
185185

186186
/* Fortran integer */
187187
#if OMPI_HAVE_FORTRAN_INTEGER
@@ -241,7 +241,7 @@ OP_FUNC(sum, uint32_t, uint32_t, +=)
241241
OP_FUNC(sum, int64_t, int64_t, +=)
242242
OP_FUNC(sum, uint64_t, uint64_t, +=)
243243
OP_FUNC(sum, long, long, +=)
244-
OP_FUNC(sum, unsigned_long, long, +=)
244+
OP_FUNC(sum, unsigned_long, unsigned long, +=)
245245

246246
/* Fortran integer */
247247
#if OMPI_HAVE_FORTRAN_INTEGER
@@ -311,7 +311,7 @@ OP_FUNC(prod, uint32_t, uint32_t, *=)
311311
OP_FUNC(prod, int64_t, int64_t, *=)
312312
OP_FUNC(prod, uint64_t, uint64_t, *=)
313313
OP_FUNC(prod, long, long, *=)
314-
OP_FUNC(prod, unsigned_long, long, *=)
314+
OP_FUNC(prod, unsigned_long, unsigned long, *=)
315315

316316
/* Fortran integer */
317317
#if OMPI_HAVE_FORTRAN_INTEGER
@@ -383,7 +383,7 @@ FUNC_FUNC(land, uint32_t, uint32_t)
383383
FUNC_FUNC(land, int64_t, int64_t)
384384
FUNC_FUNC(land, uint64_t, uint64_t)
385385
FUNC_FUNC(land, long, long)
386-
FUNC_FUNC(land, unsigned_long, long)
386+
FUNC_FUNC(land, unsigned_long, unsigned long)
387387

388388
/* Logical */
389389
#if OMPI_HAVE_FORTRAN_LOGICAL
@@ -408,7 +408,7 @@ FUNC_FUNC(lor, uint32_t, uint32_t)
408408
FUNC_FUNC(lor, int64_t, int64_t)
409409
FUNC_FUNC(lor, uint64_t, uint64_t)
410410
FUNC_FUNC(lor, long, long)
411-
FUNC_FUNC(lor, unsigned_long, long)
411+
FUNC_FUNC(lor, unsigned_long, unsigned long)
412412

413413
/* Logical */
414414
#if OMPI_HAVE_FORTRAN_LOGICAL
@@ -433,7 +433,7 @@ FUNC_FUNC(lxor, uint32_t, uint32_t)
433433
FUNC_FUNC(lxor, int64_t, int64_t)
434434
FUNC_FUNC(lxor, uint64_t, uint64_t)
435435
FUNC_FUNC(lxor, long, long)
436-
FUNC_FUNC(lxor, unsigned_long, long)
436+
FUNC_FUNC(lxor, unsigned_long, unsigned long)
437437

438438

439439
/* Logical */
@@ -459,7 +459,7 @@ FUNC_FUNC(band, uint32_t, uint32_t)
459459
FUNC_FUNC(band, int64_t, int64_t)
460460
FUNC_FUNC(band, uint64_t, uint64_t)
461461
FUNC_FUNC(band, long, long)
462-
FUNC_FUNC(band, unsigned_long, long)
462+
FUNC_FUNC(band, unsigned_long, unsigned long)
463463

464464
/* Fortran integer */
465465
#if OMPI_HAVE_FORTRAN_INTEGER
@@ -499,7 +499,7 @@ FUNC_FUNC(bor, uint32_t, uint32_t)
499499
FUNC_FUNC(bor, int64_t, int64_t)
500500
FUNC_FUNC(bor, uint64_t, uint64_t)
501501
FUNC_FUNC(bor, long, long)
502-
FUNC_FUNC(bor, unsigned_long, long)
502+
FUNC_FUNC(bor, unsigned_long, unsigned long)
503503

504504
/* Fortran integer */
505505
#if OMPI_HAVE_FORTRAN_INTEGER
@@ -539,7 +539,7 @@ FUNC_FUNC(bxor, uint32_t, uint32_t)
539539
FUNC_FUNC(bxor, int64_t, int64_t)
540540
FUNC_FUNC(bxor, uint64_t, uint64_t)
541541
FUNC_FUNC(bxor, long, long)
542-
FUNC_FUNC(bxor, unsigned_long, long)
542+
FUNC_FUNC(bxor, unsigned_long, unsigned long)
543543

544544
/* Fortran integer */
545545
#if OMPI_HAVE_FORTRAN_INTEGER
@@ -730,7 +730,7 @@ FUNC_FUNC_3BUF(max, uint32_t, uint32_t)
730730
FUNC_FUNC_3BUF(max, int64_t, int64_t)
731731
FUNC_FUNC_3BUF(max, uint64_t, uint64_t)
732732
FUNC_FUNC_3BUF(max, long, long)
733-
FUNC_FUNC_3BUF(max, unsigned_long, long)
733+
FUNC_FUNC_3BUF(max, unsigned_long, unsigned long)
734734

735735
/* Fortran integer */
736736
#if OMPI_HAVE_FORTRAN_INTEGER
@@ -793,7 +793,7 @@ FUNC_FUNC_3BUF(min, uint32_t, uint32_t)
793793
FUNC_FUNC_3BUF(min, int64_t, int64_t)
794794
FUNC_FUNC_3BUF(min, uint64_t, uint64_t)
795795
FUNC_FUNC_3BUF(min, long, long)
796-
FUNC_FUNC_3BUF(min, unsigned_long, long)
796+
FUNC_FUNC_3BUF(min, unsigned_long, unsigned long)
797797

798798
/* Fortran integer */
799799
#if OMPI_HAVE_FORTRAN_INTEGER
@@ -853,7 +853,7 @@ OP_FUNC_3BUF(sum, uint32_t, uint32_t, +)
853853
OP_FUNC_3BUF(sum, int64_t, int64_t, +)
854854
OP_FUNC_3BUF(sum, uint64_t, uint64_t, +)
855855
OP_FUNC_3BUF(sum, long, long, +)
856-
OP_FUNC_3BUF(sum, unsigned_long, long, +)
856+
OP_FUNC_3BUF(sum, unsigned_long, unsigned long, +)
857857

858858
/* Fortran integer */
859859
#if OMPI_HAVE_FORTRAN_INTEGER
@@ -923,7 +923,7 @@ OP_FUNC_3BUF(prod, uint32_t, uint32_t, *)
923923
OP_FUNC_3BUF(prod, int64_t, int64_t, *)
924924
OP_FUNC_3BUF(prod, uint64_t, uint64_t, *)
925925
OP_FUNC_3BUF(prod, long, long, *)
926-
OP_FUNC_3BUF(prod, unsigned_long, long, *)
926+
OP_FUNC_3BUF(prod, unsigned_long, unsigned long, *)
927927

928928
/* Fortran integer */
929929
#if OMPI_HAVE_FORTRAN_INTEGER
@@ -995,7 +995,7 @@ FUNC_FUNC_3BUF(land, uint32_t, uint32_t)
995995
FUNC_FUNC_3BUF(land, int64_t, int64_t)
996996
FUNC_FUNC_3BUF(land, uint64_t, uint64_t)
997997
FUNC_FUNC_3BUF(land, long, long)
998-
FUNC_FUNC_3BUF(land, unsigned_long, long)
998+
FUNC_FUNC_3BUF(land, unsigned_long, unsigned long)
999999

10001000
/* Logical */
10011001
#if OMPI_HAVE_FORTRAN_LOGICAL
@@ -1020,7 +1020,7 @@ FUNC_FUNC_3BUF(lor, uint32_t, uint32_t)
10201020
FUNC_FUNC_3BUF(lor, int64_t, int64_t)
10211021
FUNC_FUNC_3BUF(lor, uint64_t, uint64_t)
10221022
FUNC_FUNC_3BUF(lor, long, long)
1023-
FUNC_FUNC_3BUF(lor, unsigned_long, long)
1023+
FUNC_FUNC_3BUF(lor, unsigned_long, unsigned long)
10241024

10251025
/* Logical */
10261026
#if OMPI_HAVE_FORTRAN_LOGICAL
@@ -1045,7 +1045,7 @@ FUNC_FUNC_3BUF(lxor, uint32_t, uint32_t)
10451045
FUNC_FUNC_3BUF(lxor, int64_t, int64_t)
10461046
FUNC_FUNC_3BUF(lxor, uint64_t, uint64_t)
10471047
FUNC_FUNC_3BUF(lxor, long, long)
1048-
FUNC_FUNC_3BUF(lxor, unsigned_long, long)
1048+
FUNC_FUNC_3BUF(lxor, unsigned_long, unsigned long)
10491049

10501050
/* Logical */
10511051
#if OMPI_HAVE_FORTRAN_LOGICAL
@@ -1070,7 +1070,7 @@ FUNC_FUNC_3BUF(band, uint32_t, uint32_t)
10701070
FUNC_FUNC_3BUF(band, int64_t, int64_t)
10711071
FUNC_FUNC_3BUF(band, uint64_t, uint64_t)
10721072
FUNC_FUNC_3BUF(band, long, long)
1073-
FUNC_FUNC_3BUF(band, unsigned_long, long)
1073+
FUNC_FUNC_3BUF(band, unsigned_long, unsigned long)
10741074

10751075
/* Fortran integer */
10761076
#if OMPI_HAVE_FORTRAN_INTEGER
@@ -1110,7 +1110,7 @@ FUNC_FUNC_3BUF(bor, uint32_t, uint32_t)
11101110
FUNC_FUNC_3BUF(bor, int64_t, int64_t)
11111111
FUNC_FUNC_3BUF(bor, uint64_t, uint64_t)
11121112
FUNC_FUNC_3BUF(bor, long, long)
1113-
FUNC_FUNC_3BUF(bor, unsigned_long, long)
1113+
FUNC_FUNC_3BUF(bor, unsigned_long, unsigned long)
11141114

11151115
/* Fortran integer */
11161116
#if OMPI_HAVE_FORTRAN_INTEGER
@@ -1150,7 +1150,7 @@ FUNC_FUNC_3BUF(bxor, uint32_t, uint32_t)
11501150
FUNC_FUNC_3BUF(bxor, int64_t, int64_t)
11511151
FUNC_FUNC_3BUF(bxor, uint64_t, uint64_t)
11521152
FUNC_FUNC_3BUF(bxor, long, long)
1153-
FUNC_FUNC_3BUF(bxor, unsigned_long, long)
1153+
FUNC_FUNC_3BUF(bxor, unsigned_long, unsigned long)
11541154

11551155
/* Fortran integer */
11561156
#if OMPI_HAVE_FORTRAN_INTEGER

0 commit comments

Comments
 (0)