Merge branch 'upstream/latest' into dfsg/latest

4 files changed, 4 insertions, 4 deletions

diff --git a/utilities/Rips_complex/rips_correlation_matrix_persistence.cpp b/utilities/Rips_complex/rips_correlation_matrix_persistence.cpp
index c78677d2..287e8915 100644
--- a/utilities/Rips_complex/rips_correlation_matrix_persistence.cpp
+++ b/utilities/Rips_complex/rips_correlation_matrix_persistence.cpp
@@ -166,6 +166,6 @@ void program_options(int argc, char* argv[], std::string& csv_matrix_file, std::
 
     std::cout << "Usage: " << argv[0] << " [options] input-file" << std::endl << std::endl;
     std::cout << visible << std::endl;
-    std::abort();
+    exit(-1);
   }
 }
diff --git a/utilities/Rips_complex/rips_distance_matrix_persistence.cpp b/utilities/Rips_complex/rips_distance_matrix_persistence.cpp
index 53191ca7..c73152cf 100644
--- a/utilities/Rips_complex/rips_distance_matrix_persistence.cpp
+++ b/utilities/Rips_complex/rips_distance_matrix_persistence.cpp
@@ -128,6 +128,6 @@ void program_options(int argc, char* argv[], std::string& csv_matrix_file, std::
 
     std::cout << "Usage: " << argv[0] << " [options] input-file" << std::endl << std::endl;
     std::cout << visible << std::endl;
-    std::abort();
+    exit(-1);
   }
 }
diff --git a/utilities/Rips_complex/rips_persistence.cpp b/utilities/Rips_complex/rips_persistence.cpp
index 7cee927e..9410b9c2 100644
--- a/utilities/Rips_complex/rips_persistence.cpp
+++ b/utilities/Rips_complex/rips_persistence.cpp
@@ -130,6 +130,6 @@ void program_options(int argc, char* argv[], std::string& off_file_points, std::
 
     std::cout << "Usage: " << argv[0] << " [options] input-file" << std::endl << std::endl;
     std::cout << visible << std::endl;
-    std::abort();
+    exit(-1);
   }
 }
diff --git a/utilities/Rips_complex/sparse_rips_persistence.cpp b/utilities/Rips_complex/sparse_rips_persistence.cpp
index bcd5c2c5..6d4d86fd 100644
--- a/utilities/Rips_complex/sparse_rips_persistence.cpp
+++ b/utilities/Rips_complex/sparse_rips_persistence.cpp
@@ -128,6 +128,6 @@ void program_options(int argc, char* argv[], std::string& off_file_points, std::
 
     std::cout << "Usage: " << argv[0] << " [options] input-file" << std::endl << std::endl;
     std::cout << visible << std::endl;
-    std::abort();
+    exit(-1);
   }
 }