diff options
author | Gard Spreemann <gspreemann@gmail.com> | 2018-09-09 05:51:46 +0200 |
---|---|---|
committer | Gard Spreemann <gspreemann@gmail.com> | 2018-09-09 05:51:46 +0200 |
commit | 75d365e9df3b9c25f48a475a53188668b5cd2951 (patch) | |
tree | 3906301decc85aeaedf90e140550f5836a6e7fac /utilities | |
parent | 41482b4260b4aff3d6803e340d5c94fbefb9af67 (diff) | |
parent | ef5c01b599c6a6b23b1f3e92736ec67a6e62b55f (diff) |
Merge branch 'upstream/latest' into dfsg/latest
Diffstat (limited to 'utilities')
12 files changed, 12 insertions, 12 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); } } diff --git a/utilities/Cech_complex/cech_persistence.cpp b/utilities/Cech_complex/cech_persistence.cpp index abd9dbcd..93e92695 100644 --- a/utilities/Cech_complex/cech_persistence.cpp +++ b/utilities/Cech_complex/cech_persistence.cpp @@ -131,6 +131,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/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); } } diff --git a/utilities/Witness_complex/strong_witness_persistence.cpp b/utilities/Witness_complex/strong_witness_persistence.cpp index 9d23df74..f386e992 100644 --- a/utilities/Witness_complex/strong_witness_persistence.cpp +++ b/utilities/Witness_complex/strong_witness_persistence.cpp @@ -151,6 +151,6 @@ void program_options(int argc, char* argv[], int& nbL, std::string& file_name, s 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/Witness_complex/weak_witness_persistence.cpp b/utilities/Witness_complex/weak_witness_persistence.cpp index 1315d2ba..ea00cfe7 100644 --- a/utilities/Witness_complex/weak_witness_persistence.cpp +++ b/utilities/Witness_complex/weak_witness_persistence.cpp @@ -151,6 +151,6 @@ void program_options(int argc, char* argv[], int& nbL, std::string& file_name, s std::cout << "Usage: " << argv[0] << " [options] input-file" << std::endl << std::endl; std::cout << visible << std::endl; - std::abort(); + exit(-1); } } |