Commit d1bef799 authored by Leif Walsh's avatar Leif Walsh

fixed osx compilation breakage due to format strings

parent 9db054d4
...@@ -163,13 +163,13 @@ public: ...@@ -163,13 +163,13 @@ public:
// like crazy, it should expose the bug // like crazy, it should expose the bug
bn_data* bnd = BLB_DATA(&sn, 0); bn_data* bnd = BLB_DATA(&sn, 0);
size_t old_size = bnd->m_buffer_mempool.size; size_t old_size = bnd->m_buffer_mempool.size;
if (verbose) printf("frag size: %" PRIu64 "\n", bnd->m_buffer_mempool.frag_size); if (verbose) printf("frag size: %zu\n", bnd->m_buffer_mempool.frag_size);
if (verbose) printf("size: %" PRIu64 "\n", bnd->m_buffer_mempool.size); if (verbose) printf("size: %zu\n", bnd->m_buffer_mempool.size);
for (uint32_t i = 0; i < 1000000; i++) { for (uint32_t i = 0; i < 1000000; i++) {
le_overwrite(bnd, 0, "a", 2, "aval", 5); le_overwrite(bnd, 0, "a", 2, "aval", 5);
} }
if (verbose) printf("frag size: %" PRIu64 "\n", bnd->m_buffer_mempool.frag_size); if (verbose) printf("frag size: %zu\n", bnd->m_buffer_mempool.frag_size);
if (verbose) printf("size: %" PRIu64 "\n", bnd->m_buffer_mempool.size); if (verbose) printf("size: %zu\n", bnd->m_buffer_mempool.size);
size_t new_size = bnd->m_buffer_mempool.size; size_t new_size = bnd->m_buffer_mempool.size;
// just a crude test to make sure we did not grow unbounded. // just a crude test to make sure we did not grow unbounded.
// if this assert ever fails, revisit the code and see what is going // if this assert ever fails, revisit the code and see what is going
......
...@@ -22,7 +22,7 @@ static void *t1_func(void *arg) { ...@@ -22,7 +22,7 @@ static void *t1_func(void *arg) {
rwlock.write_unlock(); rwlock.write_unlock();
toku_mutex_unlock(&rwlock_mutex); toku_mutex_unlock(&rwlock_mutex);
} }
printf("%lu %d\n", pthread_self(), i); printf("%lu %d\n", (unsigned long) pthread_self(), i);
return arg; return arg;
} }
......
...@@ -18,7 +18,7 @@ static void *t1_func(void *arg) { ...@@ -18,7 +18,7 @@ static void *t1_func(void *arg) {
r = pthread_rwlock_unlock(&rwlock); r = pthread_rwlock_unlock(&rwlock);
assert(r == 0); assert(r == 0);
} }
printf("%lu %d\n", pthread_self(), i); printf("%lu %d\n", (unsigned long) pthread_self(), i);
return arg; return arg;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment