Skip to content

Commit a8fc35c

Browse files
committed
Treat unsigned long as unsigned, not signed long
This likely had no impact on arithmetic operations but bites us on min and max. We should use unsigned long consistently though. Signed-off-by: Joseph Schuchart <schuchart@icl.utk.edu>
1 parent 59928bb commit a8fc35c

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
@@ -162,7 +162,7 @@ FUNC_FUNC(max, uint32_t, uint32_t)
162162
FUNC_FUNC(max, int64_t, int64_t)
163163
FUNC_FUNC(max, uint64_t, uint64_t)
164164
FUNC_FUNC(max, long, long)
165-
FUNC_FUNC(max, unsigned_long, long)
165+
FUNC_FUNC(max, unsigned_long, unsigned long)
166166

167167
/* Fortran integer */
168168
#if OMPI_HAVE_FORTRAN_INTEGER
@@ -228,7 +228,7 @@ FUNC_FUNC(min, uint32_t, uint32_t)
228228
FUNC_FUNC(min, int64_t, int64_t)
229229
FUNC_FUNC(min, uint64_t, uint64_t)
230230
FUNC_FUNC(min, long, long)
231-
FUNC_FUNC(min, unsigned_long, long)
231+
FUNC_FUNC(min, unsigned_long, unsigned long)
232232

233233
/* Fortran integer */
234234
#if OMPI_HAVE_FORTRAN_INTEGER
@@ -291,7 +291,7 @@ OP_FUNC(sum, uint32_t, uint32_t, +=)
291291
OP_FUNC(sum, int64_t, int64_t, +=)
292292
OP_FUNC(sum, uint64_t, uint64_t, +=)
293293
OP_FUNC(sum, long, long, +=)
294-
OP_FUNC(sum, unsigned_long, long, +=)
294+
OP_FUNC(sum, unsigned_long, unsigned long, +=)
295295

296296
/* Fortran integer */
297297
#if OMPI_HAVE_FORTRAN_INTEGER
@@ -363,7 +363,7 @@ OP_FUNC(prod, uint32_t, uint32_t, *=)
363363
OP_FUNC(prod, int64_t, int64_t, *=)
364364
OP_FUNC(prod, uint64_t, uint64_t, *=)
365365
OP_FUNC(prod, long, long, *=)
366-
OP_FUNC(prod, unsigned_long, long, *=)
366+
OP_FUNC(prod, unsigned_long, unsigned long, *=)
367367

368368
/* Fortran integer */
369369
#if OMPI_HAVE_FORTRAN_INTEGER
@@ -437,7 +437,7 @@ FUNC_FUNC(land, uint32_t, uint32_t)
437437
FUNC_FUNC(land, int64_t, int64_t)
438438
FUNC_FUNC(land, uint64_t, uint64_t)
439439
FUNC_FUNC(land, long, long)
440-
FUNC_FUNC(land, unsigned_long, long)
440+
FUNC_FUNC(land, unsigned_long, unsigned long)
441441

442442
/* Logical */
443443
#if OMPI_HAVE_FORTRAN_LOGICAL
@@ -462,7 +462,7 @@ FUNC_FUNC(lor, uint32_t, uint32_t)
462462
FUNC_FUNC(lor, int64_t, int64_t)
463463
FUNC_FUNC(lor, uint64_t, uint64_t)
464464
FUNC_FUNC(lor, long, long)
465-
FUNC_FUNC(lor, unsigned_long, long)
465+
FUNC_FUNC(lor, unsigned_long, unsigned long)
466466

467467
/* Logical */
468468
#if OMPI_HAVE_FORTRAN_LOGICAL
@@ -487,7 +487,7 @@ FUNC_FUNC(lxor, uint32_t, uint32_t)
487487
FUNC_FUNC(lxor, int64_t, int64_t)
488488
FUNC_FUNC(lxor, uint64_t, uint64_t)
489489
FUNC_FUNC(lxor, long, long)
490-
FUNC_FUNC(lxor, unsigned_long, long)
490+
FUNC_FUNC(lxor, unsigned_long, unsigned long)
491491

492492

493493
/* Logical */
@@ -513,7 +513,7 @@ FUNC_FUNC(band, uint32_t, uint32_t)
513513
FUNC_FUNC(band, int64_t, int64_t)
514514
FUNC_FUNC(band, uint64_t, uint64_t)
515515
FUNC_FUNC(band, long, long)
516-
FUNC_FUNC(band, unsigned_long, long)
516+
FUNC_FUNC(band, unsigned_long, unsigned long)
517517

518518
/* Fortran integer */
519519
#if OMPI_HAVE_FORTRAN_INTEGER
@@ -553,7 +553,7 @@ FUNC_FUNC(bor, uint32_t, uint32_t)
553553
FUNC_FUNC(bor, int64_t, int64_t)
554554
FUNC_FUNC(bor, uint64_t, uint64_t)
555555
FUNC_FUNC(bor, long, long)
556-
FUNC_FUNC(bor, unsigned_long, long)
556+
FUNC_FUNC(bor, unsigned_long, unsigned long)
557557

558558
/* Fortran integer */
559559
#if OMPI_HAVE_FORTRAN_INTEGER
@@ -593,7 +593,7 @@ FUNC_FUNC(bxor, uint32_t, uint32_t)
593593
FUNC_FUNC(bxor, int64_t, int64_t)
594594
FUNC_FUNC(bxor, uint64_t, uint64_t)
595595
FUNC_FUNC(bxor, long, long)
596-
FUNC_FUNC(bxor, unsigned_long, long)
596+
FUNC_FUNC(bxor, unsigned_long, unsigned long)
597597

598598
/* Fortran integer */
599599
#if OMPI_HAVE_FORTRAN_INTEGER
@@ -822,7 +822,7 @@ FUNC_FUNC_3BUF(max, uint32_t, uint32_t)
822822
FUNC_FUNC_3BUF(max, int64_t, int64_t)
823823
FUNC_FUNC_3BUF(max, uint64_t, uint64_t)
824824
FUNC_FUNC_3BUF(max, long, long)
825-
FUNC_FUNC_3BUF(max, unsigned_long, long)
825+
FUNC_FUNC_3BUF(max, unsigned_long, unsigned long)
826826

827827
/* Fortran integer */
828828
#if OMPI_HAVE_FORTRAN_INTEGER
@@ -888,7 +888,7 @@ FUNC_FUNC_3BUF(min, uint32_t, uint32_t)
888888
FUNC_FUNC_3BUF(min, int64_t, int64_t)
889889
FUNC_FUNC_3BUF(min, uint64_t, uint64_t)
890890
FUNC_FUNC_3BUF(min, long, long)
891-
FUNC_FUNC_3BUF(min, unsigned_long, long)
891+
FUNC_FUNC_3BUF(min, unsigned_long, unsigned long)
892892

893893
/* Fortran integer */
894894
#if OMPI_HAVE_FORTRAN_INTEGER
@@ -951,7 +951,7 @@ OP_FUNC_3BUF(sum, uint32_t, uint32_t, +)
951951
OP_FUNC_3BUF(sum, int64_t, int64_t, +)
952952
OP_FUNC_3BUF(sum, uint64_t, uint64_t, +)
953953
OP_FUNC_3BUF(sum, long, long, +)
954-
OP_FUNC_3BUF(sum, unsigned_long, long, +)
954+
OP_FUNC_3BUF(sum, unsigned_long, unsigned long, +)
955955

956956
/* Fortran integer */
957957
#if OMPI_HAVE_FORTRAN_INTEGER
@@ -1023,7 +1023,7 @@ OP_FUNC_3BUF(prod, uint32_t, uint32_t, *)
10231023
OP_FUNC_3BUF(prod, int64_t, int64_t, *)
10241024
OP_FUNC_3BUF(prod, uint64_t, uint64_t, *)
10251025
OP_FUNC_3BUF(prod, long, long, *)
1026-
OP_FUNC_3BUF(prod, unsigned_long, long, *)
1026+
OP_FUNC_3BUF(prod, unsigned_long, unsigned long, *)
10271027

10281028
/* Fortran integer */
10291029
#if OMPI_HAVE_FORTRAN_INTEGER
@@ -1097,7 +1097,7 @@ FUNC_FUNC_3BUF(land, uint32_t, uint32_t)
10971097
FUNC_FUNC_3BUF(land, int64_t, int64_t)
10981098
FUNC_FUNC_3BUF(land, uint64_t, uint64_t)
10991099
FUNC_FUNC_3BUF(land, long, long)
1100-
FUNC_FUNC_3BUF(land, unsigned_long, long)
1100+
FUNC_FUNC_3BUF(land, unsigned_long, unsigned long)
11011101

11021102
/* Logical */
11031103
#if OMPI_HAVE_FORTRAN_LOGICAL
@@ -1122,7 +1122,7 @@ FUNC_FUNC_3BUF(lor, uint32_t, uint32_t)
11221122
FUNC_FUNC_3BUF(lor, int64_t, int64_t)
11231123
FUNC_FUNC_3BUF(lor, uint64_t, uint64_t)
11241124
FUNC_FUNC_3BUF(lor, long, long)
1125-
FUNC_FUNC_3BUF(lor, unsigned_long, long)
1125+
FUNC_FUNC_3BUF(lor, unsigned_long, unsigned long)
11261126

11271127
/* Logical */
11281128
#if OMPI_HAVE_FORTRAN_LOGICAL
@@ -1147,7 +1147,7 @@ FUNC_FUNC_3BUF(lxor, uint32_t, uint32_t)
11471147
FUNC_FUNC_3BUF(lxor, int64_t, int64_t)
11481148
FUNC_FUNC_3BUF(lxor, uint64_t, uint64_t)
11491149
FUNC_FUNC_3BUF(lxor, long, long)
1150-
FUNC_FUNC_3BUF(lxor, unsigned_long, long)
1150+
FUNC_FUNC_3BUF(lxor, unsigned_long, unsigned long)
11511151

11521152
/* Logical */
11531153
#if OMPI_HAVE_FORTRAN_LOGICAL
@@ -1172,7 +1172,7 @@ FUNC_FUNC_3BUF(band, uint32_t, uint32_t)
11721172
FUNC_FUNC_3BUF(band, int64_t, int64_t)
11731173
FUNC_FUNC_3BUF(band, uint64_t, uint64_t)
11741174
FUNC_FUNC_3BUF(band, long, long)
1175-
FUNC_FUNC_3BUF(band, unsigned_long, long)
1175+
FUNC_FUNC_3BUF(band, unsigned_long, unsigned long)
11761176

11771177
/* Fortran integer */
11781178
#if OMPI_HAVE_FORTRAN_INTEGER
@@ -1212,7 +1212,7 @@ FUNC_FUNC_3BUF(bor, uint32_t, uint32_t)
12121212
FUNC_FUNC_3BUF(bor, int64_t, int64_t)
12131213
FUNC_FUNC_3BUF(bor, uint64_t, uint64_t)
12141214
FUNC_FUNC_3BUF(bor, long, long)
1215-
FUNC_FUNC_3BUF(bor, unsigned_long, long)
1215+
FUNC_FUNC_3BUF(bor, unsigned_long, unsigned long)
12161216

12171217
/* Fortran integer */
12181218
#if OMPI_HAVE_FORTRAN_INTEGER
@@ -1252,7 +1252,7 @@ FUNC_FUNC_3BUF(bxor, uint32_t, uint32_t)
12521252
FUNC_FUNC_3BUF(bxor, int64_t, int64_t)
12531253
FUNC_FUNC_3BUF(bxor, uint64_t, uint64_t)
12541254
FUNC_FUNC_3BUF(bxor, long, long)
1255-
FUNC_FUNC_3BUF(bxor, unsigned_long, long)
1255+
FUNC_FUNC_3BUF(bxor, unsigned_long, unsigned long)
12561256

12571257
/* Fortran integer */
12581258
#if OMPI_HAVE_FORTRAN_INTEGER

0 commit comments

Comments
 (0)