Fix cpplint warnings

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

Former-commit-id: b4e1ec1b6cc95a6a7207e68fb31e064c0e3bd065

9 files changed, 23 insertions, 24 deletions

diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker.h
index 85fada4f..bd907131 100644
--- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker.h
+++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker.h
@@ -37,7 +37,8 @@ namespace Gudhi {
 
 namespace skeleton_blocker {
 
-/** \defgroup skbl Skeleton-Blocker 
+/** \defgroup skbl Skeleton-Blocker
+@{
 
 \author David Salinas
 
@@ -236,12 +237,12 @@ The author wishes to thank Dominique Attali and André Lieutier for
 their collaboration to write the two initial papers 
 \cite socg_blockers_2011,\cite blockers2012
  about this data-structure
- and also Dominique for leaving him use a prototype. 
+ and also Dominique for leaving him use a prototype.
 
 
-\copyright GNU General Public License v3.                         
- */
-/** @} */ // end defgroup
+\copyright GNU General Public License v3.
+
+@} */
 
 }  // namespace skeleton_blocker
 
diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/Skeleton_blocker_simple_traits.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/Skeleton_blocker_simple_traits.h
index 469717ae..3835cf77 100644
--- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/Skeleton_blocker_simple_traits.h
+++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/Skeleton_blocker_simple_traits.h
@@ -148,7 +148,6 @@ struct Skeleton_blocker_simple_traits {
     int index_;
 
    public:
-
     Graph_edge()
         : a_(-1),
         b_(-1),
diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/internal/Trie.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/internal/Trie.h
index ccc7c36b..b0ee35f5 100644
--- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/internal/Trie.h
+++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/internal/Trie.h
@@ -45,7 +45,6 @@ struct Trie {
   const Trie* parent_;
 
  public:
-
   Trie() : parent_(0) { }
 
   Trie(Vertex_handle v_) : v(v_), parent_(0) { }
@@ -80,7 +79,6 @@ struct Trie {
  private:
   // go down recursively in the tree while advancing the simplex iterator.
   // when it reaches a leaf, it inserts the remaining that is not present
-
   void add_simplex_helper(Simplex_vertex_const_iterator s_it, Simplex_vertex_const_iterator s_end) {
     assert(*s_it == v);
     ++s_it;
@@ -106,7 +104,6 @@ struct Trie {
   }
 
  public:
-
   /**
    * adds the simplex to the trie
    */
diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/iterators/Skeleton_blockers_blockers_iterators.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/iterators/Skeleton_blockers_blockers_iterators.h
index 4049fb0b..d2fff960 100644
--- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/iterators/Skeleton_blockers_blockers_iterators.h
+++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/iterators/Skeleton_blockers_blockers_iterators.h
@@ -47,7 +47,6 @@ ReturnType
   MapIteratorType end_of_map;
 
  public:
-
   Blocker_iterator_internal() : current_position() { }
 
   Blocker_iterator_internal(MapIteratorType position, MapIteratorType end_of_map_) :
@@ -66,7 +65,6 @@ ReturnType
   }
 
  private:
-
   /**
    * Let the current pair be (v,sigma) where v is a vertex and sigma is a blocker.
    * If v is not the first vertex of sigma then we already have seen sigma as a blocker
diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/iterators/Skeleton_blockers_simplices_iterators.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/iterators/Skeleton_blockers_simplices_iterators.h
index c9482263..20d5600c 100644
--- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/iterators/Skeleton_blockers_simplices_iterators.h
+++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/iterators/Skeleton_blockers_simplices_iterators.h
@@ -69,7 +69,8 @@ public boost::iterator_facade < Simplex_around_vertex_iterator<SkeletonBlockerCo
   Vertex_handle v;
   std::shared_ptr<Link> link_v;
   std::shared_ptr<Trie> trie;
-  std::list<Trie*> nodes_to_be_seen; // todo deque
+  // TODO(DS): use a deque instead
+  std::list<Trie*> nodes_to_be_seen;
 
  public:
   Simplex_around_vertex_iterator() : complex(0) { }
@@ -161,7 +162,8 @@ public boost::iterator_facade < Simplex_around_vertex_iterator<SkeletonBlockerCo
 
     bool both_non_empty = !nodes_to_be_seen.empty() && !other.nodes_to_be_seen.empty();
 
-    if (!both_non_empty) return false; // one is empty the other is not
+    // one is empty the other is not
+    if (!both_non_empty) return false;
 
     bool same_node = (**(nodes_to_be_seen.begin()) == **(other.nodes_to_be_seen.begin()));
     return same_node;
diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/iterators/Skeleton_blockers_triangles_iterators.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/iterators/Skeleton_blockers_triangles_iterators.h
index 4e0dbb74..736941dd 100644
--- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/iterators/Skeleton_blockers_triangles_iterators.h
+++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker/iterators/Skeleton_blockers_triangles_iterators.h
@@ -136,7 +136,7 @@ typename SkeletonBlockerComplex::Simplex const
   Triangle_iterator(const SkeletonBlockerComplex* complex) :
       complex_(complex),
       current_vertex_(complex->vertex_range().begin()),
-      current_triangle_(complex, *current_vertex_), // xxx this line is problematic is the complex is empty
+      current_triangle_(complex, *current_vertex_),  // this line is problematic is the complex is empty
       is_end_(false) {
     assert(!complex->empty());
     gotoFirstTriangle();
@@ -185,8 +185,10 @@ typename SkeletonBlockerComplex::Simplex const
   // goto the next vertex that has a triangle pending or the
   // end vertex iterator if none exists
   void goto_next_vertex() {
-    assert(current_triangle_.finished()); // we mush have consume all triangles passing through the vertex
-    assert(!is_finished()); // we must not be done
+    // we must have consume all triangles passing through the vertex
+    assert(current_triangle_.finished());
+    // we must not be done
+    assert(!is_finished());
 
     ++current_vertex_;
 
diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_complex.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_complex.h
index c1a0cf2d..4f052ba5 100644
--- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_complex.h
+++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_complex.h
@@ -104,8 +104,8 @@ class Skeleton_blocker_complex {
   typedef typename Simplex::Simplex_vertex_const_iterator Simplex_handle_iterator;
 
  protected:
-  typedef typename boost::adjacency_list<boost::setS, // edges
-  boost::vecS, // vertices
+  typedef typename boost::adjacency_list<boost::setS,  // edges
+  boost::vecS,  // vertices
   boost::undirectedS, Graph_vertex, Graph_edge> Graph;
   // todo/remark : edges are not sorted, it heavily penalizes computation for SuperiorLink
   // (eg Link with greater vertices)
@@ -445,7 +445,7 @@ class Skeleton_blocker_complex {
     boost::optional<Vertex_handle> res;
     int num_vertices = boost::num_vertices(skeleton);
     if (id.vertex < num_vertices)
-      res = Vertex_handle(id.vertex); // xxx
+      res = Vertex_handle(id.vertex);
     return res;
   }
 
diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_link_complex.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_link_complex.h
index 906d3e86..4db075b0 100644
--- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_link_complex.h
+++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_link_complex.h
@@ -201,8 +201,8 @@ ComplexType> {
    * corresponding address in 'other_complex'.
    * It assumes that other_complex have a vertex 'this.get_id(address)'
    */
-  boost::optional<Vertex_handle> give_equivalent_vertex(
-                                                        const ComplexType & other_complex, Vertex_handle address) const {
+  boost::optional<Vertex_handle> give_equivalent_vertex(const ComplexType & other_complex,
+                                                        Vertex_handle address) const {
     Root_vertex_handle id((*this)[address].get_id());
     return other_complex.get_address(id);
   }
diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_simplifiable_complex.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_simplifiable_complex.h
index fcb6bafe..544e02e8 100644
--- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_simplifiable_complex.h
+++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_simplifiable_complex.h
@@ -146,8 +146,7 @@ void Skeleton_blocker_complex<SkeletonBlockerDS>::remove_star(Vertex_handle v) {
  * whenever the dimension of tau is at least 2.
  */
 template<typename SkeletonBlockerDS>
-void Skeleton_blocker_complex<SkeletonBlockerDS>::update_blockers_after_remove_star_of_vertex_or_edge(
-                                                                                                      const Simplex& simplex_to_be_removed) {
+void Skeleton_blocker_complex<SkeletonBlockerDS>::update_blockers_after_remove_star_of_vertex_or_edge(const Simplex& simplex_to_be_removed) {
   std::list <Blocker_handle> blockers_to_update;
   if (simplex_to_be_removed.empty()) return;
 
@@ -384,7 +383,8 @@ Skeleton_blocker_complex<SkeletonBlockerDS>::contract_edge(Vertex_handle a, Vert
 
 template<typename SkeletonBlockerDS>
 void Skeleton_blocker_complex<SkeletonBlockerDS>::get_blockers_to_be_added_after_contraction(Vertex_handle a,
-                                                                                             Vertex_handle b, std::set<Simplex>& blockers_to_add) {
+                                                                                             Vertex_handle b,
+                                                                                             std::set<Simplex>& blockers_to_add) {
   blockers_to_add.clear();
 
   typedef Skeleton_blocker_link_complex<Skeleton_blocker_complex<SkeletonBlockerDS> > LinkComplexType;