Merge branch 'upstream/latest' into dfsg/latest

5 files changed, 5 insertions, 5 deletions

diff --git a/utilities/Alpha_complex/alpha_complex_3d_persistence.cpp b/utilities/Alpha_complex/alpha_complex_3d_persistence.cpp
index 8cda0b70..6e603155 100644
--- a/utilities/Alpha_complex/alpha_complex_3d_persistence.cpp
+++ b/utilities/Alpha_complex/alpha_complex_3d_persistence.cpp
@@ -266,6 +266,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/Alpha_complex/alpha_complex_persistence.cpp b/utilities/Alpha_complex/alpha_complex_persistence.cpp
index 42390b0e..8e6c40b7 100644
--- a/utilities/Alpha_complex/alpha_complex_persistence.cpp
+++ b/utilities/Alpha_complex/alpha_complex_persistence.cpp
@@ -133,6 +133,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/Alpha_complex/exact_alpha_complex_3d_persistence.cpp b/utilities/Alpha_complex/exact_alpha_complex_3d_persistence.cpp
index cbe003ff..61f49bb1 100644
--- a/utilities/Alpha_complex/exact_alpha_complex_3d_persistence.cpp
+++ b/utilities/Alpha_complex/exact_alpha_complex_3d_persistence.cpp
@@ -260,6 +260,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/Alpha_complex/periodic_alpha_complex_3d_persistence.cpp b/utilities/Alpha_complex/periodic_alpha_complex_3d_persistence.cpp
index 11010701..a261c5a3 100644
--- a/utilities/Alpha_complex/periodic_alpha_complex_3d_persistence.cpp
+++ b/utilities/Alpha_complex/periodic_alpha_complex_3d_persistence.cpp
@@ -297,6 +297,6 @@ void program_options(int argc, char *argv[], std::string &off_file_points, std::
 
     std::cout << "Usage: " << argv[0] << " [options] input-file cuboid-file" << std::endl << std::endl;
     std::cout << visible << std::endl;
-    std::abort();
+    exit(-1);
   }
 }
diff --git a/utilities/Alpha_complex/weighted_alpha_complex_3d_persistence.cpp b/utilities/Alpha_complex/weighted_alpha_complex_3d_persistence.cpp
index cdeeabfc..aa7ddee2 100644
--- a/utilities/Alpha_complex/weighted_alpha_complex_3d_persistence.cpp
+++ b/utilities/Alpha_complex/weighted_alpha_complex_3d_persistence.cpp
@@ -311,6 +311,6 @@ void program_options(int argc, char *argv[], std::string &off_file_points, std::
 
     std::cout << "Usage: " << argv[0] << " [options] input-file weight-file" << std::endl << std::endl;
     std::cout << visible << std::endl;
-    std::abort();
+    exit(-1);
   }
 }