fixed example and bench

This commit is contained in:
gabime 2014-12-07 06:54:25 +02:00
parent 04c116315a
commit 7f174a2b2f
2 changed files with 2 additions and 6 deletions

View File

@ -52,11 +52,7 @@ int main(int argc, char* argv[])
int howmany = 1048576;
int threads = 10;
<<<<<<< HEAD
bool auto_flush = false;
=======
bool auto_flush = false;
>>>>>>> cppformat
int file_size = 30 * 1024 * 1024;
int rotating_files = 5;

View File

@ -26,7 +26,7 @@
// spdlog usage example
//
#include <iostream>
#include "spdlog/spdlog.h"ls
#include "spdlog/spdlog.h"
int main(int, char* [])
@ -49,7 +49,7 @@ int main(int, char* [])
console->info("Easy padding in numbers like {:08d}", 12);
console->info("Support for int: {0:d}; hex: {0:x}; oct: {0:o}; bin: {0:b}", 42);
console->info("Support for int: {0:d}; hex: {0:08x}; oct: {0:o}; bin: {0:b}", 42);
console->info("Support for floats {:03.2f}", 1.23456);
console->info("Positional args are {1} {0}..", "too", "supported");