summaryrefslogtreecommitdiff
path: root/src/common/include
diff options
context:
space:
mode:
authorvrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2018-06-13 07:32:36 +0000
committervrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2018-06-13 07:32:36 +0000
commite7fa347f0d0e0160e90ee2f869c8039625aaed5f (patch)
tree9b52d565f995056f3968fb61a6134169e69e1a1c /src/common/include
parente0634f23c228f5f4061b45a7b9af31a3310e11a4 (diff)
Fix cppcheck issues
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@3601 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 44cc04b1609d3b3d40382fd02d4fe15e5ba0159f
Diffstat (limited to 'src/common/include')
-rw-r--r--src/common/include/gudhi/Off_reader.h2
-rw-r--r--src/common/include/gudhi/distance_functions.h4
-rw-r--r--src/common/include/gudhi/random_point_generators.h3
-rw-r--r--src/common/include/gudhi/writing_persistence_to_file.h8
4 files changed, 9 insertions, 8 deletions
diff --git a/src/common/include/gudhi/Off_reader.h b/src/common/include/gudhi/Off_reader.h
index 024f0568..05a1e145 100644
--- a/src/common/include/gudhi/Off_reader.h
+++ b/src/common/include/gudhi/Off_reader.h
@@ -137,7 +137,7 @@ class Off_reader {
if (!std::ifstream::sentry(stream_)) return false;
std::getline(stream_, uncomment_line);
} while (uncomment_line[0] == '#');
- return (bool)stream_;
+ return static_cast<bool>(stream_);
}
template<typename OffVisitor>
diff --git a/src/common/include/gudhi/distance_functions.h b/src/common/include/gudhi/distance_functions.h
index 4dfba1bf..5ef12f2e 100644
--- a/src/common/include/gudhi/distance_functions.h
+++ b/src/common/include/gudhi/distance_functions.h
@@ -100,14 +100,14 @@ class Minimal_enclosing_ball_radius {
*/
template< typename Point_cloud,
typename Point_iterator = typename boost::range_const_iterator<Point_cloud>::type,
- typename Point= typename std::iterator_traits<Point_iterator>::value_type,
+ typename Point = typename std::iterator_traits<Point_iterator>::value_type,
typename Coordinate_iterator = typename boost::range_const_iterator<Point>::type,
typename Coordinate = typename std::iterator_traits<Coordinate_iterator>::value_type>
Coordinate
operator()(const Point_cloud& point_cloud) const {
using Min_sphere = Miniball::Miniball<Miniball::CoordAccessor<Point_iterator, Coordinate_iterator>>;
- Min_sphere ms(boost::size(*point_cloud.begin()), point_cloud.begin(),point_cloud.end());
+ Min_sphere ms(boost::size(*point_cloud.begin()), point_cloud.begin(), point_cloud.end());
#ifdef DEBUG_TRACES
std::cout << "Minimal_enclosing_ball_radius = " << std::sqrt(ms.squared_radius()) << " | nb points = "
<< boost::size(point_cloud) << " | dimension = "
diff --git a/src/common/include/gudhi/random_point_generators.h b/src/common/include/gudhi/random_point_generators.h
index 1f8f2cd8..f8107c8b 100644
--- a/src/common/include/gudhi/random_point_generators.h
+++ b/src/common/include/gudhi/random_point_generators.h
@@ -190,7 +190,8 @@ template <typename Kernel, typename OutputIterator>
static void generate_uniform_points_on_torus_d(const Kernel &k, int dim, std::size_t num_slices,
OutputIterator out,
double radius_noise_percentage = 0.,
- std::vector<typename Kernel::FT> current_point = std::vector<typename Kernel::FT>()) {
+ std::vector<typename Kernel::FT> current_point =
+ std::vector<typename Kernel::FT>()) {
CGAL::Random rng;
int point_size = static_cast<int>(current_point.size());
if (point_size == 2 * dim) {
diff --git a/src/common/include/gudhi/writing_persistence_to_file.h b/src/common/include/gudhi/writing_persistence_to_file.h
index 4c5ce918..34448576 100644
--- a/src/common/include/gudhi/writing_persistence_to_file.h
+++ b/src/common/include/gudhi/writing_persistence_to_file.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef WRITING_PERSISTENCE_TO_FILE_H
-#define WRITING_PERSISTENCE_TO_FILE_H
+#ifndef WRITING_PERSISTENCE_TO_FILE_H_
+#define WRITING_PERSISTENCE_TO_FILE_H_
#include <iostream>
#include <string>
@@ -112,6 +112,6 @@ void write_persistence_intervals_to_stream(const Persistence_interval_range& int
}
}
-}
+} // namespace Gudhi
-#endif // WRITING_PERSISTENCE_TO_FILE_H
+#endif // WRITING_PERSISTENCE_TO_FILE_H_