diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-02-28 12:12:39 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-02-28 12:12:39 +0000 |
| commit | 42451e635474bfbbf866927707d2acfb7e426928 (patch) | |
| tree | 818fe133c0823b75017c1ce096c84fd905d64e91 /src/Witness_complex/include | |
| parent | 5709f808d1a3cf0960cccd4c91a2ffde44a5867b (diff) | |
Fix CppCheck
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/relaxed-witness@2116 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 39094c55b9ccb3f09e344a6eff474c3373b13292
Diffstat (limited to 'src/Witness_complex/include')
3 files changed, 15 insertions, 15 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 c9f506d9..ffc1750f 100644 --- a/src/Witness_complex/include/gudhi/Active_witness/Active_witness.h +++ b/src/Witness_complex/include/gudhi/Active_witness/Active_witness.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef ACTIVE_WITNESS_H_ -#define ACTIVE_WITNESS_H_ +#ifndef ACTIVE_WITNESS_ACTIVE_WITNESS_H_ +#define ACTIVE_WITNESS_ACTIVE_WITNESS_H_ #include <gudhi/Active_witness/Active_witness_iterator.h> #include <vector> @@ -68,4 +68,4 @@ public: } } -#endif +#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 7f48faa4..69a335fa 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 @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef ACTIVE_WITNESS_ITERATOR_H_ -#define ACTIVE_WITNESS_ITERATOR_H_ +#ifndef ACTIVE_WITNESS_ACTIVE_WITNESS_ITERATOR_H_ +#define ACTIVE_WITNESS_ACTIVE_WITNESS_ITERATOR_H_ #include <boost/iterator/iterator_facade.hpp> #include <vector> @@ -67,9 +67,9 @@ public: { is_end_ = false; if (lh_ == aw_->nearest_landmark_table_.end()) { - if (aw_->iterator_next_ == aw_->iterator_end_) + if (aw_->iterator_next_ == aw_->iterator_end_) { is_end_ = true; - else { + } else { aw_->nearest_landmark_table_.push_back(*aw_->iterator_next_); lh_ = --aw_->nearest_landmark_table_.end(); ++(aw_->iterator_next_); @@ -97,9 +97,9 @@ private : lh_++; if (lh_ == aw_->nearest_landmark_table_.end()) { - if (aw_->iterator_next_ == aw_->iterator_end_) + if (aw_->iterator_next_ == aw_->iterator_end_) { is_end_ = true; - else { + } else { aw_->nearest_landmark_table_.push_back(*aw_->iterator_next_); lh_ = std::prev(aw_->nearest_landmark_table_.end()); ++(aw_->iterator_next_); @@ -108,7 +108,7 @@ private : } }; -} -} +} // namespace witness_complex +} // namespace Gudhi -#endif +#endif // ACTIVE_WITNESS_ACTIVE_WITNESS_ITERATOR_H_ diff --git a/src/Witness_complex/include/gudhi/Witness_complex/all_faces_in.h b/src/Witness_complex/include/gudhi/Witness_complex/all_faces_in.h index b69719a3..d009caca 100644 --- a/src/Witness_complex/include/gudhi/Witness_complex/all_faces_in.h +++ b/src/Witness_complex/include/gudhi/Witness_complex/all_faces_in.h @@ -1,5 +1,5 @@ -#ifndef ALL_FACES_IN_H_ -#define ALL_FACES_IN_H_ +#ifndef WITNESS_COMPLEX_ALL_FACES_IN_H_ +#define WITNESS_COMPLEX_ALL_FACES_IN_H_ /* \brief Check if the facets of the k-dimensional simplex witnessed * by witness witness_id are already in the complex. @@ -32,4 +32,4 @@ template < typename SimplicialComplexForWitness, return true; } -#endif +#endif // WITNESS_COMPLEX_ALL_FACES_IN_H_ |