moved from unsigned long long to uint64_t

Author: awegrzyn

include/Monitoring/Metric.h

@@ -18,7 +18,7 @@ namespace AliceO2
 namespace Monitoring
 {
 
-enum MetricType { INT = 0, STRING = 1, DOUBLE = 2, UNSIGNEDLONGLONG = 3 };
+enum MetricType { INT = 0, STRING = 1, DOUBLE = 2, UINT64_T = 3 };
 
 /// \brief Represents metric parameters except (value, name, entity and timestamp)
 class Metric
@@ -29,6 +29,7 @@ class Metric
     /// \param name 	 	metric name
     /// \param timestamp 	metric timestamp in milliseconds
     Metric(int value, const std::string& name, std::chrono::time_point<std::chrono::system_clock> timestamp = Metric::getCurrentTimestamp());
+
     /// Initialize class variables
     /// \param value            metric value (string)
     /// \param name             the metric name
@@ -42,10 +43,10 @@ class Metric
     Metric(double value, const std::string& name, std::chrono::time_point<std::chrono::system_clock> timestamp = Metric::getCurrentTimestamp());
 
     /// Initialize class variables
-    /// \param value            metric value (unsigned long long)
+    /// \param value            metric value (uint64_t)
     /// \param name             metric name
     /// \param timestamp        metric timestamp in milliseconds
-    Metric(unsigned long long value, const std::string& name, std::chrono::time_point<std::chrono::system_clock> timestamp = Metric::getCurrentTimestamp());
+    Metric(uint64_t value, const std::string& name, std::chrono::time_point<std::chrono::system_clock> timestamp = Metric::getCurrentTimestamp());
 
     /// Default destructor
     ~Metric() = default;
@@ -60,7 +61,7 @@ class Metric
 
     /// Value getter
     /// \return metric value
-    boost::variant< int, std::string, double, unsigned long long > getValue() const;
+    boost::variant< int, std::string, double, uint64_t > getValue() const;
 
     /// Value type getter
     /// \return type of value stores inside metric : 0 - int, 1 - std::string, 2 - double
@@ -86,7 +87,7 @@ class Metric
 
   private:
     /// Metric value
-    boost::variant< int, std::string, double, unsigned long long > mValue;
+    boost::variant< int, std::string, double, uint64_t > mValue;
 
     /// Metric name
     std::string mName;

src/Collector.cxx

@@ -181,17 +181,17 @@ void Collector::sendTimed(T value, std::string name, std::chrono::time_point<std
 template void Collector::send(int, std::string);
 template void Collector::send(double, std::string);
 template void Collector::send(std::string, std::string);
-template void Collector::send(unsigned long long, std::string);
+template void Collector::send(uint64_t, std::string);
 
 template void Collector::sendTagged(int, std::string, std::vector<Tag>&& tags);
 template void Collector::sendTagged(double, std::string, std::vector<Tag>&& tags);
 template void Collector::sendTagged(std::string, std::string, std::vector<Tag>&& tags);
-template void Collector::sendTagged(unsigned long long, std::string, std::vector<Tag>&& tags);
+template void Collector::sendTagged(uint64_t, std::string, std::vector<Tag>&& tags);
 
 template void Collector::sendTimed(int, std::string, std::chrono::time_point<std::chrono::system_clock>& timestamp);
 template void Collector::sendTimed(double, std::string, std::chrono::time_point<std::chrono::system_clock>& timestamp);
 template void Collector::sendTimed(std::string, std::string, std::chrono::time_point<std::chrono::system_clock>& timestamp);
-template void Collector::sendTimed(unsigned long long, std::string, std::chrono::time_point<std::chrono::system_clock>& timestamp);
+template void Collector::sendTimed(uint64_t, std::string, std::chrono::time_point<std::chrono::system_clock>& timestamp);
 
 } // namespace Monitoring
 } // namespace AliceO2

src/Metric.cxx

@@ -42,11 +42,11 @@ Metric::Metric(double value, const std::string& name, std::chrono::time_point<st
   mValue(value), mName(name), mTimestamp(timestamp)
 {}
 
-Metric::Metric(unsigned long long value, const std::string& name, std::chrono::time_point<std::chrono::system_clock> timestamp) :
+Metric::Metric(uint64_t value, const std::string& name, std::chrono::time_point<std::chrono::system_clock> timestamp) :
   mValue(value), mName(name), mTimestamp(timestamp)
 {}
 
-boost::variant< int, std::string, double, unsigned long long > Metric::getValue() const
+boost::variant< int, std::string, double, uint64_t > Metric::getValue() const
 {
   return mValue;
 }

test/testMetric.cxx

@@ -50,11 +50,11 @@ BOOST_AUTO_TEST_CASE(retrieveString)
 
 BOOST_AUTO_TEST_CASE(retrieveUnsignedLongLong)
 {
-  unsigned long long value = 10000000000000LL;
+  uint64_t value = 10000000000000LL;
   std::string name("metric name");
   AliceO2::Monitoring::Metric metricInstance(value,  name );
 
-  BOOST_CHECK_EQUAL(boost::get<unsigned long long>(metricInstance.getValue()), 10000000000000LL);
+  BOOST_CHECK_EQUAL(boost::get<uint64_t>(metricInstance.getValue()), 10000000000000LL);
   BOOST_CHECK_EQUAL(metricInstance.getType(), 3);
 }