Merge master and resolve conflicts

1 files changed, 4 insertions, 4 deletions

diff --git a/src/common/include/gudhi/Points_off_io.h b/src/common/include/gudhi/Points_off_io.h
index 99371d56..9dc40568 100644
--- a/src/common/include/gudhi/Points_off_io.h
+++ b/src/common/include/gudhi/Points_off_io.h
@@ -40,7 +40,7 @@ class Points_off_visitor_reader {
    */
   void init(int dim, int num_vertices, int num_faces, int num_edges) {
 #ifdef DEBUG_TRACES
-    std::cout << "Points_off_visitor_reader::init - dim=" << dim << " - num_vertices=" <<
+    std::clog << "Points_off_visitor_reader::init - dim=" << dim << " - num_vertices=" <<
         num_vertices << " - num_faces=" << num_faces << " - num_edges=" << num_edges << std::endl;
 #endif  // DEBUG_TRACES
     if (num_faces > 0) {
@@ -66,11 +66,11 @@ class Points_off_visitor_reader {
    */
   void point(const std::vector<double>& point) {
 #ifdef DEBUG_TRACES
-    std::cout << "Points_off_visitor_reader::point ";
+    std::clog << "Points_off_visitor_reader::point ";
     for (auto coordinate : point) {
-      std::cout << coordinate << " | ";
+      std::clog << coordinate << " | ";
     }
-    std::cout << std::endl;
+    std::clog << std::endl;
 #endif  // DEBUG_TRACES
     // Fill the point cloud
     point_cloud.push_back(Point_d(point.begin(), point.end()));