Merge pull request #111 from google/buildtype_log

src/console_reporter.cc

@@ -41,16 +41,13 @@ bool ConsoleReporter::ReportContext(const Context& context) {
   }
 
 #ifndef NDEBUG
-  std::cerr << "Build Type: DEBUG\n";
+  std::cerr << "***WARNING*** Library was built as DEBUG. Timings may be "
+               "affected.\n";
 #endif
 
-  int output_width =
-      fprintf(stdout,
-              "%-*s %10s %10s %10s\n",
-              static_cast<int>(name_field_width_),
-              "Benchmark",
-              "Time(ns)", "CPU(ns)",
-              "Iterations");
+  int output_width = fprintf(stdout, "%-*s %10s %10s %10s\n",
+                             static_cast<int>(name_field_width_), "Benchmark",
+                             "Time(ns)", "CPU(ns)", "Iterations");
   std::cout << std::string(output_width - 1, '-') << "\n";
 
   return true;

src/csv_reporter.cc

@@ -39,7 +39,8 @@ bool CSVReporter::ReportContext(const Context& context) {
   }
 
 #ifndef NDEBUG
-  std::cerr << "Build Type: DEBUG\n";
+  std::cerr << "***WARNING*** Library was built as DEBUG. Timings may be "
+               "affected.\n";
 #endif
   std::cout << "name,iterations,real_time,cpu_time,bytes_per_second,"
                "items_per_second,label\n";

src/json_reporter.cc

@@ -84,7 +84,7 @@ bool JSONReporter::ReportContext(const Context& context) {
 #else
   const char build_type[] = "debug";
 #endif
-  out << indent << FormatKV("build_type", build_type) << "\n";
+  out << indent << FormatKV("library_build_type", build_type) << "\n";
   // Close context block and open the list of benchmarks.
   out << inner_indent << "},\n";
   out << inner_indent << "\"benchmarks\": [\n";
@@ -162,4 +162,4 @@ void JSONReporter::PrintRunData(Run const& run) {
     out << '\n';
 }
 
-} // end namespace benchmark
\ No newline at end of file
+} // end namespace benchmark