diff --git a/bricks/brick-hash.h b/bricks/brick-hash.h index 80f623173..8243ebdb4 100644 --- a/bricks/brick-hash.h +++ b/bricks/brick-hash.h @@ -800,7 +800,7 @@ struct Jenkins { saw[i] = SpookyHash::Hash32(buf, i, 0); if (saw[i] != expected[i]) { - printf("%3d: saw 0x%.8x, expected 0x%.8lx\n", i, saw[i], expected[i]); + printf("%3d: saw 0x%.8x, expected 0x%.8lx\n", i, saw[i], (unsigned long) expected[i]); ASSERT( false ); } } diff --git a/bricks/brick-shmem.h b/bricks/brick-shmem.h index 1f4353900..a4325da8b 100644 --- a/bricks/brick-shmem.h +++ b/bricks/brick-shmem.h @@ -369,7 +369,7 @@ protected: Node *next; Node() { read = write = buffer; - next = 0; + next = nullptr; } }; @@ -393,7 +393,7 @@ public: ~Fifo() { while ( head != tail ) { Node *next = head->next; - ASSERT( next != 0 ); + ASSERT( next != nullptr ); delete head; head = next; }