Merge pull request #39 from gjasny/fix-type-mismatches

Build fixes for various platforms

Author: jupp0r

include/prometheus/counter_builder.h

@@ -19,8 +19,6 @@ detail::CounterBuilder BuildCounter();
 namespace detail {
 class CounterBuilder {
  public:
-  friend CounterBuilder BuildCounter();
-
   CounterBuilder& Labels(const std::map<std::string, std::string>& labels);
   CounterBuilder& Name(const std::string&);
   CounterBuilder& Help(const std::string&);

include/prometheus/gauge_builder.h

@@ -19,8 +19,6 @@ detail::GaugeBuilder BuildGauge();
 namespace detail {
 class GaugeBuilder {
  public:
-  friend GaugeBuilder BuildGauge();
-
   GaugeBuilder& Labels(const std::map<std::string, std::string>& labels);
   GaugeBuilder& Name(const std::string&);
   GaugeBuilder& Help(const std::string&);

include/prometheus/histogram_builder.h

@@ -20,8 +20,6 @@ detail::HistogramBuilder BuildHistogram();
 namespace detail {
 class HistogramBuilder {
  public:
-  friend HistogramBuilder BuildHistogram();
-
   HistogramBuilder& Labels(const std::map<std::string, std::string>& labels);
   HistogramBuilder& Name(const std::string&);
   HistogramBuilder& Help(const std::string&);

lib/handler.cc

@@ -74,7 +74,7 @@ bool MetricsHandler::handleGet(CivetServer* server,
             "HTTP/1.1 200 OK\r\n"
             "Content-Type: %s\r\n",
             content_type.c_str());
-  mg_printf(conn, "Content-Length: %lu\r\n\r\n", body.size());
+  mg_printf(conn, "Content-Length: %lu\r\n\r\n", static_cast<unsigned long>(body.size()));
   mg_write(conn, body.data(), body.size());
 
   auto stop_time_of_request = std::chrono::steady_clock::now();

lib/histogram.cc

@@ -7,7 +7,7 @@
 namespace prometheus {
 
 Histogram::Histogram(const BucketBoundaries& buckets)
-    : bucket_boundaries_{buckets}, bucket_counts_(buckets.size() + 1) {}
+    : bucket_boundaries_(buckets), bucket_counts_(buckets.size() + 1) {}
 
 void Histogram::Observe(double value) {
   // TODO: determine bucket list size at which binary search would be faster
@@ -29,7 +29,7 @@ io::prometheus::client::Metric Histogram::Collect() {
   histogram->set_sample_count(sample_count);
   histogram->set_sample_sum(sum_.Value());
 
-  for (int i = 0; i < bucket_counts_.size(); i++) {
+  for (std::size_t i = 0; i < bucket_counts_.size(); i++) {
     auto& count = bucket_counts_[i];
     auto bucket = histogram->add_bucket();
     bucket->set_cumulative_count(count.Value());

lib/histogram_builder.cc

@@ -1,4 +1,4 @@
-#include "prometheus/gauge_builder.h"
+#include "prometheus/histogram_builder.h"
 #include "prometheus/registry.h"
 
 namespace prometheus {

tests/benchmark/benchmark_helpers.cc

@@ -21,7 +21,7 @@ std::map<std::string, std::string> GenerateRandomLabels(
     std::size_t number_of_pairs) {
   const auto label_character_count = 10;
   auto label_pairs = std::map<std::string, std::string>{};
-  for (int i = 0; i < number_of_pairs; i++) {
+  for (std::size_t i = 0; i < number_of_pairs; i++) {
     label_pairs.insert({GenerateRandomString(label_character_count),
                         GenerateRandomString(label_character_count)});
   }