@@ -46,8 +46,8 @@ TEST_CASE("RelationsMapStash 64bit") {
4646 REQUIRE (stash.empty ());
4747 REQUIRE (stash.size () == 0 ); // NOLINT(readability-container-size-empty)
4848
49- const uint64_t maxsmall = (1UL << 32UL ) - 1 ;
50- const uint64_t large = 1UL << 33UL ;
49+ const uint64_t maxsmall = (1ULL << 32ULL ) - 1 ;
50+ const uint64_t large = 1ULL << 33ULL ;
5151
5252 stash.add (1 , 2 );
5353 stash.add (2 , maxsmall);
@@ -112,7 +112,7 @@ TEST_CASE("RelationsMapStash duplicates will be removed in index") {
112112 osmium::index::RelationsMapStash stash;
113113 REQUIRE (stash.empty ());
114114
115- const uint64_t large = 1UL << 33UL ;
115+ const uint64_t large = 1ULL << 33ULL ;
116116
117117 stash.add (1 , 2 );
118118 stash.add (2 , 3 );
@@ -149,7 +149,7 @@ TEST_CASE("RelationsMapStash n:m results") {
149149 osmium::index::RelationsMapStash stash;
150150 REQUIRE (stash.empty ());
151151
152- const uint64_t large = 1UL << 33UL ;
152+ const uint64_t large = 1ULL << 33ULL ;
153153
154154 stash.add (3 , large + 1 );
155155 stash.add (3 , large + 2 );
@@ -245,7 +245,7 @@ TEST_CASE("RelationsMapStash reverse index with 64bit values") {
245245 osmium::index::RelationsMapStash stash;
246246 REQUIRE (stash.empty ());
247247
248- const uint64_t large = 1UL << 33UL ;
248+ const uint64_t large = 1ULL << 33ULL ;
249249
250250 stash.add (1 , 2 );
251251 stash.add (2 , 3 );
@@ -341,20 +341,20 @@ TEST_CASE("RelationsMapStash small and large") {
341341
342342 stash.add (1 , 2 );
343343 stash.add (2 , 3 );
344- stash.add (4 , (1UL << 32UL ) - 1 );
345- stash.add ((1UL << 32UL ) - 1 , 5 );
344+ stash.add (4 , (1ULL << 32ULL ) - 1 );
345+ stash.add ((1ULL << 32ULL ) - 1 , 5 );
346346
347347 REQUIRE (stash.sizes ().first == 4 );
348348 REQUIRE (stash.sizes ().second == 0 );
349349
350- stash.add (6 , (1UL << 32UL ) + 1 );
351- stash.add ((1UL << 32UL ) + 1 , 7 );
350+ stash.add (6 , (1ULL << 32ULL ) + 1 );
351+ stash.add ((1ULL << 32ULL ) + 1 , 7 );
352352
353353 REQUIRE (stash.sizes ().first == 4 );
354354 REQUIRE (stash.sizes ().second == 2 );
355355
356- stash.add (8 , (1UL << 63UL ));
357- stash.add ((1UL << 63UL ), 9 );
356+ stash.add (8 , (1ULL << 63ULL ));
357+ stash.add ((1ULL << 63ULL ), 9 );
358358
359359 REQUIRE (stash.sizes ().first == 4 );
360360 REQUIRE (stash.sizes ().second == 4 );
0 commit comments