[EDGE-879] run clang-format and make sure style is good

This commit is contained in:
Nora Shoemaker 2015-07-15 09:51:33 -07:00
parent d6551de8d4
commit 5892385e5c
1 changed files with 10 additions and 13 deletions

View File

@ -1429,17 +1429,14 @@ int main(int argc, char **argv) {
if ((int)config.nreqs < config.nconns) { if ((int)config.nreqs < config.nconns) {
std::cerr << "-C, -n: warning: two different test times are being set. " std::cerr << "-C, -n: warning: two different test times are being set. "
<< std::endl; << std::endl;
std::cerr << "The test will run for " std::cerr << "The test will run for " << c_time << " seconds."
<< c_time << std::endl;
<< " seconds." << std::endl; } else {
}
else {
std::cout << "-C, -n: warning: two different test times are being set. " std::cout << "-C, -n: warning: two different test times are being set. "
<< std::endl; << std::endl;
std::cout << "The smaller of the two will be chosen and the test will " std::cout << "The smaller of the two will be chosen and the test will "
<< "run for " << "run for " << std::min(n_time, c_time) << " seconds."
<< std::min(n_time, c_time) << std::endl;
<< " seconds." << std::endl;
} }
} }
@ -1555,7 +1552,7 @@ int main(int argc, char **argv) {
fut.get(); fut.get();
} }
#endif // NOTHREADS #endif // NOTHREADS
} //! config.is_rate_mode() } //! config.is_rate_mode()
// if in rate mode, create a new worker each second // if in rate mode, create a new worker each second
else { else {
// set various config values // set various config values