From 9e2f837de0b3db9d9613093f9632c1d928dfcec8 Mon Sep 17 00:00:00 2001
From: Joseph Mirabel <jmirabel@laas.fr>
Date: Tue, 8 Mar 2016 14:03:04 +0100
Subject: [PATCH] Use std::size_t instead of size_t. Remove src/bin.cc in
CMakeLists.txt
---
include/hpp/statistics/bin.hh | 10 +++++-----
src/CMakeLists.txt | 1 -
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/include/hpp/statistics/bin.hh b/include/hpp/statistics/bin.hh
index 7215863..ac6421f 100644
--- a/include/hpp/statistics/bin.hh
+++ b/include/hpp/statistics/bin.hh
@@ -36,21 +36,21 @@ namespace hpp {
{
public:
/// Return the number of element in the bin.
- size_t freq () const
+ const std::size_t& freq () const
{
return freq_;
}
/// Add an occurence
/// \return The frequency after increment;
- size_t operator ++()
+ std::size_t operator ++()
{
return ++freq_;
}
/// Add an occurence
/// \return The frequency before increment;
- size_t operator ++(int)
+ std::size_t operator ++(int)
{
return freq_++;
}
@@ -70,7 +70,7 @@ namespace hpp {
private:
/// The number of occurence.
- size_t freq_;
+ std::size_t freq_;
};
inline std::ostream& operator<< (std::ostream& os, const hpp::statistics::Bin& b)
@@ -93,7 +93,7 @@ namespace hpp {
/// \param bin a Bin for which only the value is useful.
/// \note It searches for the equivalent Bin is the set and
/// returns the frequency of the result.
- virtual size_t freq (const T& bin) const;
+ virtual std::size_t freq (const T& bin) const;
/// Return the relative frequency of a Bin.
/// \param bin a Bin for which only the value is useful.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6852c35..f7b0f8f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -20,7 +20,6 @@
SET(LIBRARY_NAME ${PROJECT_NAME})
ADD_LIBRARY(${LIBRARY_NAME} SHARED
- bin.cc
success-bin.cc
)
--
GitLab