Fix cppcheck

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

Former-commit-id: 49a5c2c6e94d9fbf235eecc92fa30e62980c7c70

2 files changed, 27 insertions, 36 deletions

diff --git a/src/Witness_complex/include/gudhi/Active_witness/Active_witness.h b/src/Witness_complex/include/gudhi/Active_witness/Active_witness.h
index ffc1750f..d41a6811 100644
--- a/src/Witness_complex/include/gudhi/Active_witness/Active_witness.h
+++ b/src/Witness_complex/include/gudhi/Active_witness/Active_witness.h
@@ -24,8 +24,7 @@
 #define ACTIVE_WITNESS_ACTIVE_WITNESS_H_
 
 #include <gudhi/Active_witness/Active_witness_iterator.h>
-#include <vector>
-#include <utility>
+#include <list>
 
 namespace Gudhi {
 
@@ -38,7 +37,7 @@ namespace witness_complex {
 template< typename Id_distance_pair,
           typename INS_range >
 class Active_witness {
-public:  
+ public:
   typedef Active_witness<Id_distance_pair, INS_range> ActiveWitness;
   typedef typename INS_range::iterator INS_iterator;
   typedef Active_witness_iterator< ActiveWitness, Id_distance_pair, INS_iterator > iterator;
@@ -50,22 +49,19 @@ public:
   INS_iterator iterator_end_;
 
   Active_witness(const INS_range& search_range)
-    : search_range_(search_range), iterator_next_(search_range_.begin()), iterator_end_(search_range_.end())
-  {
+    : search_range_(search_range), iterator_next_(search_range_.begin()), iterator_end_(search_range_.end()) {
   }
- 
-  iterator begin()
-  {
+
+  iterator begin() {
     return iterator(this, nearest_landmark_table_.begin());
   }
 
-  iterator end()
-  {
+  iterator end() {
     return iterator(this);
   }
 };
 
-}
-}
-  
+}  // namespace witness_complex
+}  // namespace Gudhi
+
 #endif  // ACTIVE_WITNESS_ACTIVE_WITNESS_H_
diff --git a/src/Witness_complex/include/gudhi/Active_witness/Active_witness_iterator.h b/src/Witness_complex/include/gudhi/Active_witness/Active_witness_iterator.h
index 69a335fa..4e29a40d 100644
--- a/src/Witness_complex/include/gudhi/Active_witness/Active_witness_iterator.h
+++ b/src/Witness_complex/include/gudhi/Active_witness/Active_witness_iterator.h
@@ -24,7 +24,7 @@
 #define ACTIVE_WITNESS_ACTIVE_WITNESS_ITERATOR_H_
 
 #include <boost/iterator/iterator_facade.hpp>
-#include <vector>
+#include <list>
 
 namespace Gudhi {
 
@@ -41,30 +41,29 @@ template< typename Active_witness,
           typename Id_distance_pair,
           typename INS_iterator >
 class Active_witness_iterator
-  : public boost::iterator_facade< Active_witness_iterator <Active_witness, Id_distance_pair, INS_iterator>
-, Id_distance_pair const
-, boost::forward_traversal_tag
-, Id_distance_pair const> {
+  : public boost::iterator_facade< Active_witness_iterator <Active_witness, Id_distance_pair, INS_iterator>,
+                                   Id_distance_pair const,
+                                   boost::forward_traversal_tag,
+                                   Id_distance_pair const> {
   friend class boost::iterator_core_access;
-  
+
   //typedef Active_witness<Id_distance_pair, INS_iterator> Active_witness;
   typedef typename std::list<Id_distance_pair>::iterator Pair_iterator;
-  typedef typename Gudhi::witness_complex::Active_witness_iterator<Active_witness, Id_distance_pair, INS_iterator> Iterator;
-  
-  
+  typedef typename Gudhi::witness_complex::Active_witness_iterator<Active_witness,
+                                                                   Id_distance_pair,
+                                                                   INS_iterator> Iterator;
+
   Active_witness *aw_;
   Pair_iterator lh_; // landmark handle
   bool is_end_; // true only if the pointer is end and there are no more neighbors to add
 
-public:
+ public:
   Active_witness_iterator(Active_witness* aw)
-    : aw_(aw), lh_(aw_->nearest_landmark_table_.end()), is_end_(true)
-  {
+    : aw_(aw), lh_(aw_->nearest_landmark_table_.end()), is_end_(true) {
   }
 
   Active_witness_iterator(Active_witness* aw, const Pair_iterator& lh)
-    : aw_(aw), lh_(lh)
-  {
+    : aw_(aw), lh_(lh) {
     is_end_ = false;
     if (lh_ == aw_->nearest_landmark_table_.end()) {
       if (aw_->iterator_next_ == aw_->iterator_end_) {
@@ -76,21 +75,17 @@ public:
       }
     }
   }
-  
-private :
 
-  Id_distance_pair& dereference() const
-  {
+ private :
+  Id_distance_pair& dereference() const {
     return *lh_;
   }
 
-  bool equal(const Iterator& other) const
-  {
+  bool equal(const Iterator& other) const {
     return (is_end_ == other.is_end_) || (lh_ == other.lh_);
   }
-  
-  void increment()
-  {
+
+  void increment() {
     // the neighbor search can't be at the end iterator of a list
     GUDHI_CHECK(!is_end_ && lh_ != aw_->nearest_landmark_table_.end(), std::logic_error("Wrong active witness increment."));
     // if the id of the current landmark is the same as the last one