diff --git a/README.md b/README.md index 148479b9..c8b94d50 100644 --- a/README.md +++ b/README.md @@ -1423,5 +1423,5 @@ When you create and build a benchmark you can run it with the following command * **-f FILTER, --filter=FILTER** - Filter benchmarks by the given regexp pattern * **-l, --list** - List all avaliable benchmarks * **-o OUTPUT, --output=OUTPUT** - Output format (console, csv, json). Default: console -* **-s, --silent** - Launch in silent mode. No progress will be shown! +* **-q, --quiet** - Launch in quiet mode. No progress will be shown! * **-r HISTOGRAMS, --histograms=HISTOGRAMS** - Create High Dynamic Range (HDR) Histogram files with a given resolution. Default: 0 diff --git a/documents/Doxyfile b/documents/Doxyfile index 62ff86ea..de41973c 100644 --- a/documents/Doxyfile +++ b/documents/Doxyfile @@ -38,7 +38,7 @@ PROJECT_NAME = CppBenchmark # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 1.0.2.0 +PROJECT_NUMBER = 1.0.3.0 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/include/benchmark/version.h b/include/benchmark/version.h index e450e7ec..6bdde42d 100644 --- a/include/benchmark/version.h +++ b/include/benchmark/version.h @@ -32,7 +32,7 @@ GitHub: https://github.com/chronoxor/CppBenchmark namespace CppBenchmark { //! Project version -const char version[] = "1.0.2.0"; +const char version[] = "1.0.3.0"; } // namespace CppBenchmark diff --git a/source/benchmark/reporter_json.cpp b/source/benchmark/reporter_json.cpp index 2d08bd70..5e84324c 100644 --- a/source/benchmark/reporter_json.cpp +++ b/source/benchmark/reporter_json.cpp @@ -58,7 +58,7 @@ void ReporterJSON::ReportEnvironment() _stream << Internals::indent2 << "\"is_32_bit_process\": " << (Environment::Is32BitProcess() ? "true" : "false") << ",\n"; _stream << Internals::indent2 << "\"is_debug\": " << (Environment::IsDebug() ? "true" : "false") << ",\n"; _stream << Internals::indent2 << "\"is_release\": " << (Environment::IsRelease() ? "true" : "false") << ",\n"; - _stream << Internals::indent2 << "\"os_version\": " << Environment::OSVersion() << "\n"; + _stream << Internals::indent2 << "\"os_version\": \"" << Environment::OSVersion() << "\",\n"; _stream << Internals::indent2 << "\"timestamp\": " << Environment::Timestamp() << "\n"; _stream << Internals::indent1 << "},\n"; }