summaryrefslogtreecommitdiff
path: root/src/Witness_complex/include/gudhi/Active_witness
diff options
context:
space:
mode:
authorvrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2017-03-01 06:03:29 +0000
committervrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2017-03-01 06:03:29 +0000
commitfda43b1fde4774909c632a0604ae7ad05a660d3a (patch)
treea88abda1b405b7e0baa56ff8d08d68f4829e7ad4 /src/Witness_complex/include/gudhi/Active_witness
parentd070c2916225acdd928db5929c0cab02589ca8a8 (diff)
Fix cppcheck
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/relaxed-witness@2122 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 92d11c064056138ce4aa8cbe3a42df29a8a5ca7d
Diffstat (limited to 'src/Witness_complex/include/gudhi/Active_witness')
-rw-r--r--src/Witness_complex/include/gudhi/Active_witness/Active_witness_iterator.h11
1 files changed, 5 insertions, 6 deletions
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 4e29a40d..0a05173a 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
@@ -36,7 +36,6 @@ namespace witness_complex {
* If all the landmarks are present in the list, iterator returns the specific end value
* of the corresponding 'Active_witness' object.
*/
-
template< typename Active_witness,
typename Id_distance_pair,
typename INS_iterator >
@@ -47,15 +46,14 @@ class Active_witness_iterator
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;
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
+ Pair_iterator lh_; // landmark handle
+ bool is_end_; // true only if the pointer is end and there are no more neighbors to add
public:
Active_witness_iterator(Active_witness* aw)
@@ -87,7 +85,8 @@ class Active_witness_iterator
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."));
+ 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
lh_++;
@@ -105,5 +104,5 @@ class Active_witness_iterator
} // namespace witness_complex
} // namespace Gudhi
-
+
#endif // ACTIVE_WITNESS_ACTIVE_WITNESS_ITERATOR_H_