2 files changed, 10 insertions, 13 deletions
diff --git a/src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h b/src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h
index c6593cc4..05f70c39 100644
--- a/src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h
+++ b/src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h
@@ -572,9 +572,8 @@ class Persistent_cohomology {
         Column * curr_col = row_cell_it->self_col_;
         ++row_cell_it;
         // Disconnect the column from the rows in the CAM.
-        for (auto col_cell_it = curr_col->col_.begin();
-            col_cell_it != curr_col->col_.end(); ++col_cell_it) {
-          col_cell_it->base_hook_cam_h::unlink();
+        for (auto& col_cell : curr_col->col_) {
+          col_cell.base_hook_cam_h::unlink();
         }
 
         // Remove the column from the CAM before modifying its value
@@ -589,9 +588,9 @@ class Persistent_cohomology {
           // Find whether the column obtained is already in the CAM
           result_insert_cam = cam_.insert(*curr_col);
           if (result_insert_cam.second) {  // If it was not in the CAM before: insertion has succeeded
-            for (auto col_cell_it = curr_col->col_.begin(); col_cell_it != curr_col->col_.end(); ++col_cell_it) {
+            for (auto& col_cell : curr_col->col_) {
               // re-establish the row links
-              transverse_idx_[col_cell_it->key_].row_->push_front(*col_cell_it);
+              transverse_idx_[col_cell.key_].row_->push_front(col_cell);
             }
           } else {  // There is already an identical column in the CAM:
             // merge two disjoint sets.
diff --git a/src/Persistent_cohomology/include/gudhi/Persistent_cohomology/Persistent_cohomology_column.h b/src/Persistent_cohomology/include/gudhi/Persistent_cohomology/Persistent_cohomology_column.h
index fcec819a..5ffd1776 100644
--- a/src/Persistent_cohomology/include/gudhi/Persistent_cohomology/Persistent_cohomology_column.h
+++ b/src/Persistent_cohomology/include/gudhi/Persistent_cohomology/Persistent_cohomology_column.h
@@ -93,27 +93,25 @@ class Persistent_cohomology_column : public boost::intrusive::set_base_hook<
       boost::intrusive::base_hook<base_hook_cam_v> > Col_type;
 
   /** \brief Creates an empty column.*/
-  explicit Persistent_cohomology_column(SimplexKey key) {
-    class_key_ = key;
-    col_ = Col_type();
-  }
+  explicit Persistent_cohomology_column(SimplexKey key)
+      : col_(),
+        class_key_(key) {}
  public:
   /** Copy constructor.*/
   Persistent_cohomology_column(Persistent_cohomology_column const &other)
       : col_(),
         class_key_(other.class_key_) {
-    if (!other.col_.empty())
-      std::cerr << "Copying a non-empty column.\n";
+    assert(other.col_.empty());
   }
 
   /** \brief Returns true iff the column is null.*/
-  bool is_null() {
+  bool is_null() const {
     return col_.empty();
   }
   /** \brief Returns the key of the representative simplex of
    * the set of simplices having this column as annotation vector
    * in the compressed annotation matrix.*/
-  SimplexKey class_key() {
+  SimplexKey class_key() const {
     return class_key_;
   }