From b7e50c6d3d0bfa2836a53f24f679448967f1c047 Mon Sep 17 00:00:00 2001
From: Steve Tonneau <stonneau@meakandake>
Date: Wed, 1 Apr 2015 14:56:10 +0200
Subject: [PATCH] fix warning errors on 64bits unsigned int conversion
---
include/hpp/statistics/success-bin.hh | 6 +++---
src/success-bin.cc | 6 +++---
tests/test-distribution.cc | 2 +-
tests/test-statistics.cc | 2 +-
tests/test-successstatistics.cc | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/include/hpp/statistics/success-bin.hh b/include/hpp/statistics/success-bin.hh
index 292e124..11c979e 100644
--- a/include/hpp/statistics/success-bin.hh
+++ b/include/hpp/statistics/success-bin.hh
@@ -112,13 +112,13 @@ namespace hpp {
void addFailure (const SuccessBin::Reason& r = SuccessBin::REASON_UNKNOWN);
/// Count the number of success.
- unsigned int nbSuccess () const;
+ std::size_t nbSuccess () const;
/// Count the number of failure, in total.
- unsigned int nbFailure () const;
+ std::size_t nbFailure () const;
/// Count the number of a particular failure.
- unsigned int nbFailure (const SuccessBin::Reason& r) const;
+ std::size_t nbFailure (const SuccessBin::Reason& r) const;
};
} // namespace statistics
} // namespace hpp
diff --git a/src/success-bin.cc b/src/success-bin.cc
index dff220a..69e9b3f 100644
--- a/src/success-bin.cc
+++ b/src/success-bin.cc
@@ -77,17 +77,17 @@ namespace hpp {
insert (SuccessBin (true));
}
- unsigned int SuccessStatistics::nbSuccess () const
+ std::size_t SuccessStatistics::nbSuccess() const
{
return freq (SuccessBin(true));
}
- unsigned int SuccessStatistics::nbFailure () const
+ std::size_t SuccessStatistics::nbFailure() const
{
return numberOfObservations() - nbSuccess();
}
- unsigned int SuccessStatistics::nbFailure (const SuccessBin::Reason& r) const
+ std::size_t SuccessStatistics::nbFailure(const SuccessBin::Reason& r) const
{
return freq (SuccessBin (false, r));
}
diff --git a/tests/test-distribution.cc b/tests/test-distribution.cc
index 6bf22b0..276635c 100644
--- a/tests/test-distribution.cc
+++ b/tests/test-distribution.cc
@@ -109,7 +109,7 @@ int test2 ()
int main () {
/* initialize random seed: */
- srand (time(NULL));
+ srand (static_cast<unsigned int> (time(NULL)));
std::cout.precision(15);
diff --git a/tests/test-statistics.cc b/tests/test-statistics.cc
index 786f839..56f03cd 100644
--- a/tests/test-statistics.cc
+++ b/tests/test-statistics.cc
@@ -60,7 +60,7 @@ class TestStatistics : public Statistics <TestBin> {
int main ()
{
- srand (time(NULL));
+ srand (static_cast<unsigned int> (time(NULL)));
TestStatistics t;
double *check = new double [100];
diff --git a/tests/test-successstatistics.cc b/tests/test-successstatistics.cc
index 1f3826d..bd4c7f5 100644
--- a/tests/test-successstatistics.cc
+++ b/tests/test-successstatistics.cc
@@ -27,7 +27,7 @@ using namespace hpp;
int main ()
{
/* initialize random seed: */
- srand (time(NULL));
+ srand (static_cast<unsigned int> (time(NULL)));
using namespace hpp::statistics;
SuccessStatistics ss;
--
GitLab