cpplint and cppcheck fixes

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@956 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: f54c0a2a375e8818c7162aec05249e446361834b

6 files changed, 47 insertions, 41 deletions

diff --git a/src/Hasse_complex/include/gudhi/Hasse_complex.h b/src/Hasse_complex/include/gudhi/Hasse_complex.h
index 38887264..8b06b771 100644
--- a/src/Hasse_complex/include/gudhi/Hasse_complex.h
+++ b/src/Hasse_complex/include/gudhi/Hasse_complex.h
@@ -23,14 +23,14 @@
 #ifndef HASSE_COMPLEX_H_
 #define HASSE_COMPLEX_H_
 
+#include <gudhi/allocator.h>
+
 #include <boost/iterator/counting_iterator.hpp>
 
 #include <algorithm>
 #include <utility>  // for pair
 #include <vector>
 
-#include <gudhi/allocator.h>
-
 #ifdef GUDHI_USE_TBB
 #include <tbb/parallel_for.h>
 #endif
@@ -109,12 +109,12 @@ class Hasse_complex {
       , dim_max_(cpx.dimension()) {
     int size = complex_.size();
 #ifdef GUDHI_USE_TBB
-    tbb::parallel_for(0,size,[&](int idx){new (&complex_[idx]) Hasse_simp(cpx, cpx.simplex(idx));});
-    for (int idx=0; idx<size; ++idx)
+    tbb::parallel_for(0, size, [&](int idx){new (&complex_[idx]) Hasse_simp(cpx, cpx.simplex(idx));});
+    for (int idx=0; idx < size; ++idx)
       if (complex_[idx].boundary_.empty())
         vertices_.push_back(idx);
 #else
-    for (int idx=0; idx<size; ++idx) {
+    for (int idx=0; idx < size; ++idx) {
       new (&complex_[idx]) Hasse_simp(cpx, cpx.simplex(idx));
       if (complex_[idx].boundary_.empty())
         vertices_.push_back(idx);
diff --git a/src/Persistent_cohomology/example/parallel_rips_persistence.cpp b/src/Persistent_cohomology/example/parallel_rips_persistence.cpp
index 425a5b2c..4c6656f5 100644
--- a/src/Persistent_cohomology/example/parallel_rips_persistence.cpp
+++ b/src/Persistent_cohomology/example/parallel_rips_persistence.cpp
@@ -26,7 +26,7 @@
 #include <gudhi/distance_functions.h>
 #include <gudhi/Simplex_tree.h>
 #include <gudhi/Persistent_cohomology.h>
-#include "gudhi/Hasse_complex.h"
+#include <gudhi/Hasse_complex.h>
 
 #include <boost/program_options.hpp>
 
diff --git a/src/Simplex_tree/include/gudhi/Simplex_tree.h b/src/Simplex_tree/include/gudhi/Simplex_tree.h
index 356deb3a..708cdef9 100644
--- a/src/Simplex_tree/include/gudhi/Simplex_tree.h
+++ b/src/Simplex_tree/include/gudhi/Simplex_tree.h
@@ -528,7 +528,7 @@ class Simplex_tree {
    * The type InputVertexRange must be a range of <CODE>Vertex_handle</CODE>
    * on which we can call std::begin() function
    */
-  template<class InputVertexRange=std::initializer_list<Vertex_handle>>
+  template<class InputVertexRange = std::initializer_list<Vertex_handle>>
   Simplex_handle find(const InputVertexRange & s) {
     auto first = std::begin(s);
     auto last = std::end(s);
@@ -635,7 +635,7 @@ class Simplex_tree {
    *
    * The type InputVertexRange must be a range for which .begin() and
    * .end() return input iterators, with 'value_type' Vertex_handle. */
-  template<class InputVertexRange=std::initializer_list<Vertex_handle>>
+  template<class InputVertexRange = std::initializer_list<Vertex_handle>>
   std::pair<Simplex_handle, bool> insert_simplex(const InputVertexRange & simplex,
                                                  Filtration_value filtration = 0) {
     auto first = std::begin(simplex);
diff --git a/src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_iterators.h b/src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_iterators.h
index 794060ee..936b7a1f 100644
--- a/src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_iterators.h
+++ b/src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_iterators.h
@@ -54,7 +54,7 @@ class Simplex_tree_simplex_vertex_iterator : public boost::iterator_facade<
 
   explicit Simplex_tree_simplex_vertex_iterator(SimplexTree * st)
       :  // any end() iterator
-        sib_(NULL),
+        sib_(nullptr),
         v_(st->null_vertex()) {
   }
 
@@ -99,19 +99,19 @@ class Simplex_tree_boundary_simplex_iterator : public boost::iterator_facade<
 
 // any end() iterator
   explicit Simplex_tree_boundary_simplex_iterator(SimplexTree * st)
-      : sib_(NULL),
-        sh_(st->null_simplex()) {
+      : sib_(nullptr),
+        sh_(st->null_simplex()),
+        st_(st)  {
   }
 
   Simplex_tree_boundary_simplex_iterator(SimplexTree * st, Simplex_handle sh)
-      : suffix_(),
-        sib_(st->self_siblings(sh)),
+      : last_(sh->first),
+        sib_(nullptr),
         st_(st) {
-    last_ = sh->first;
     Siblings * sib = st->self_siblings(sh);
     next_ = sib->parent();
-    sib_ = sib->oncles(); /* \todo check if NULL*/
-    if (sib_ != NULL) {
+    sib_ = sib->oncles();
+    if (sib_ != nullptr) {
       sh_ = sib_->find(next_);
     } else {
       sh_ = st->null_simplex();
@@ -131,7 +131,7 @@ class Simplex_tree_boundary_simplex_iterator : public boost::iterator_facade<
   }
 
   void increment() {
-    if (sib_ == NULL) {
+    if (sib_ == nullptr) {
       sh_ = st_->null_simplex();
       return;
     }
@@ -189,13 +189,15 @@ class Simplex_tree_complex_simplex_iterator : public boost::iterator_facade<
 
 // any end() iterator
   Simplex_tree_complex_simplex_iterator()
-      : st_(NULL) {
+      : sib_(nullptr),
+        st_(nullptr) {
   }
 
   explicit Simplex_tree_complex_simplex_iterator(SimplexTree * st)
-      : st_(st) {
-    if (st == NULL || st->root() == NULL || st->root()->members().empty()) {
-      st_ = NULL;
+      : sib_(nullptr),
+        st_(st) {
+    if (st == nullptr || st->root() == nullptr || st->root()->members().empty()) {
+      st_ = nullptr;
     } else {
       sh_ = st->root()->members().begin();
       sib_ = st->root();
@@ -210,10 +212,10 @@ class Simplex_tree_complex_simplex_iterator : public boost::iterator_facade<
 
 // valid when iterating along the SAME boundary.
   bool equal(Simplex_tree_complex_simplex_iterator const& other) const {
-    if (other.st_ == NULL) {
-      return (st_ == NULL);
+    if (other.st_ == nullptr) {
+      return (st_ == nullptr);
     }
-    if (st_ == NULL) {
+    if (st_ == nullptr) {
       return false;
     }
     return (&(sh_->second) == &(other.sh_->second));
@@ -227,8 +229,8 @@ class Simplex_tree_complex_simplex_iterator : public boost::iterator_facade<
   void increment() {
     ++sh_;
     if (sh_ == sib_->members().end()) {
-      if (sib_->oncles() == NULL) {
-        st_ = NULL;
+      if (sib_->oncles() == nullptr) {
+        st_ = nullptr;
         return;
       }  // reach the end
       sh_ = sib_->oncles()->members().find(sib_->parent());
@@ -261,15 +263,19 @@ class Simplex_tree_skeleton_simplex_iterator : public boost::iterator_facade<
 
 // any end() iterator
   Simplex_tree_skeleton_simplex_iterator()
-      : st_(NULL) {
+      : sib_(nullptr),
+        st_(nullptr),
+        dim_skel_(0),
+        curr_dim_(0) {
   }
 
   Simplex_tree_skeleton_simplex_iterator(SimplexTree * st, int dim_skel)
-      : st_(st),
+      : sib_(nullptr),
+        st_(st),
         dim_skel_(dim_skel),
         curr_dim_(0) {
-    if (st == NULL || st->root() == NULL || st->root()->members().empty()) {
-      st_ = NULL;
+    if (st == nullptr || st->root() == nullptr || st->root()->members().empty()) {
+      st_ = nullptr;
     } else {
       sh_ = st->root()->members().begin();
       sib_ = st->root();
@@ -285,10 +291,10 @@ class Simplex_tree_skeleton_simplex_iterator : public boost::iterator_facade<
 
 // valid when iterating along the SAME boundary.
   bool equal(Simplex_tree_skeleton_simplex_iterator const& other) const {
-    if (other.st_ == NULL) {
-      return (st_ == NULL);
+    if (other.st_ == nullptr) {
+      return (st_ == nullptr);
     }
-    if (st_ == NULL) {
+    if (st_ == nullptr) {
       return false;
     }
     return (&(sh_->second) == &(other.sh_->second));
@@ -302,8 +308,8 @@ class Simplex_tree_skeleton_simplex_iterator : public boost::iterator_facade<
   void increment() {
     ++sh_;
     if (sh_ == sib_->members().end()) {
-      if (sib_->oncles() == NULL) {
-        st_ = NULL;
+      if (sib_->oncles() == nullptr) {
+        st_ = nullptr;
         return;
       }  // reach the end
       sh_ = sib_->oncles()->members().find(sib_->parent());
diff --git a/src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_siblings.h b/src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_siblings.h
index 158ee1f7..072afc8d 100644
--- a/src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_siblings.h
+++ b/src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_siblings.h
@@ -57,7 +57,7 @@ class Simplex_tree_siblings {
 
   /* Default constructor.*/
   Simplex_tree_siblings()
-      : oncles_(NULL),
+      : oncles_(nullptr),
         parent_(-1),
         members_() {
   }
diff --git a/src/common/include/gudhi/allocator.h b/src/common/include/gudhi/allocator.h
index b825173b..4ede14e4 100644
--- a/src/common/include/gudhi/allocator.h
+++ b/src/common/include/gudhi/allocator.h
@@ -20,8 +20,8 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUDHI_ALLOCATOR_H_
-#define GUDHI_ALLOCATOR_H_
+#ifndef ALLOCATOR_H_
+#define ALLOCATOR_H_
 
 #include <memory>
 #include <utility>
@@ -43,13 +43,13 @@ struct no_init_allocator : Base {
 
   // Do nothing: that's the whole point!
   template<class P>
-  void construct(P*)noexcept{}
+  void construct(P*) noexcept {}
 
-  template<class P, class...U> void construct(P*p, U&&...u){
+  template<class P, class...U> void construct(P*p, U&&...u) {
     Base_traits::construct(*(Base*)this, p, std::forward<U>(u)...);
   }
 };
 
 }  // namespace Gudhi
 
-#endif  // GUDHI_ALLOCATOR_H_
+#endif  // ALLOCATOR_H_