Fixed OS X compilation build warnings due to printf field type specifiers

This commit is contained in:
Alvin Moore 2017-09-01 09:34:53 -07:00
parent f19deec5d7
commit fd439e9d1c
3 changed files with 11 additions and 11 deletions

View File

@ -41,7 +41,7 @@ ACTOR Future<Void> _test() {
// tr->setVersion(1);
Version ver = wait( tr->getReadVersion() );
printf("%ld\n", ver);
printf("%lld\n", ver);
state std::vector< Future<Version> > versions;

View File

@ -344,10 +344,10 @@ TEST_CASE("flow/flow/quorum")
vector<Future<int>> fs;
vector<Future<Void>> qs;
for (auto& p : ps) fs.push_back(p.getFuture());
for (int i = 0; i <= ps.size(); i++)
qs.push_back( quorum(fs, i) );
for (int i = 0; i < ps.size(); i++) {
ASSERT(qs[i].isReady());
ASSERT(!qs[i + 1].isReady());
@ -357,7 +357,7 @@ TEST_CASE("flow/flow/quorum")
return Void();
}
TEST_CASE("flow/flow/trivial futures")
TEST_CASE("flow/flow/trivial futures")
{
Future<int> invalid;
ASSERT(!invalid.isValid());
@ -499,7 +499,7 @@ TEST_CASE("flow/flow/promisestream callbacks")
onReady(p.getFuture(), [&result](int x) { result = x; }, [&result](Error e){ result = -1; });
ASSERT(result == 0);
p = PromiseStream<int>();
ASSERT(result == -1);
@ -989,7 +989,7 @@ TEST_CASE("flow/flow/perf/actor patterns")
ASSERT(out2[i].isReady());
}
printf("2xcheeseActor(chooseTwoActor(cheeseActor(fifo), never)): %0.2f M/sec\n", N / 1e6 / (timer() - start));
printf("sizeof(CheeseWaitActorActor) == %d\n", sizeof(CheeseWaitActorActor));
printf("sizeof(CheeseWaitActorActor) == %lu\n", sizeof(CheeseWaitActorActor));
}
{
@ -1140,11 +1140,11 @@ TEST_CASE("flow/flow/YieldedAsyncMap/cancel2")
state Future<Void> y2 = yam.onChange(2);
auto* pyam = &yam;
uncancellable(trigger(
uncancellable(trigger(
[pyam](){
printf("Triggered\n");
pyam->triggerAll();
},
pyam->triggerAll();
},
delay(1)));
Void _ = wait(y1);
@ -1191,4 +1191,4 @@ TEST_CASE("fdbrpc/flow/wait_expression_after_cancel")
f.cancel();
ASSERT( a == 1 );
return Void();
}
}

View File

@ -79,7 +79,7 @@ bool testFuzzActor( Future<int>(*actor)(FutureStream<int> const&, PromiseStream<
}
}
if (outCount+1 != expectedOutput.size()) {
printf("\tERROR: %s output length incorrect: %d != expected %d\n", desc, outCount+1, expectedOutput.size());
printf("\tERROR: %s output length incorrect: %d != expected %lu\n", desc, outCount+1, expectedOutput.size());
if (trial) printf("\t\tResult was inconsistent between runs!\n");
ok = false;
//return false;