fix OSX clang problems

.github/workflows/build-test.yml

@@ -93,15 +93,15 @@ jobs:
           BUILD_TYPE: "Debug"
           ROOT: "OFF"
           ITK: "OFF"
-        # Currently disabled due to problems with listmode recon, see https://github.com/UCL/STIR/issues/1200
-        #- os: macOS-latest
-        #  compiler: clang
-        #  compiler_version: 16
-        #  BUILD_FLAGS: "-DSTIR_OPENMP=OFF"
-        #  parallelproj: "OFF"
-        #  BUILD_TYPE: "Release"
-        #  ROOT: "OFF"
-        #  ITK: "OFF"
+        - os: macOS-latest
+          compiler: clang
+          compiler_version: 18
+          cuda_version: "0"
+          BUILD_FLAGS: "-DSTIR_OPENMP=OFF"
+          parallelproj: "OFF"
+          BUILD_TYPE: "Release"
+          ROOT: "OFF"
+          ITK: "OFF"
 
       # let's run all of them, as opposed to aborting when one fails
       fail-fast: false

src/experimental/motion_test/test_BSpline_transformations.cxx

@@ -142,8 +142,9 @@ TestBSplineTransformation::run_tests()
       cerr << "Tests for TransformationTests\n";
       this->run_transformation();
     }
-  catch (...)
+  catch (std::exception& e)
     {
+      std::cerr << "Error thrown: " << e.what() << "\n\n";
       everything_ok = false;
     }
 }

src/include/stir/IO/test/test_IO.h

@@ -43,6 +43,7 @@
 #  include "stir/IO/ECAT6OutputFileFormat.h" // need this for test on pixel_size
 #endif
 #include <fstream>
+#include <exception>
 
 START_NAMESPACE_STIR
 
@@ -300,6 +301,11 @@ IOTests<A>::run_tests()
         return;
       std::cerr << "OK!\n";
     }
+  catch (std::exception& e)
+    {
+      std::cerr << "\\Error thrown:\n\t" << e.what() << "\n\n";
+      everything_ok = false;
+    }
   catch (...)
     {
       everything_ok = false;

src/include/stir/RunTests.h

@@ -33,6 +33,7 @@
 #include <vector>
 #include <complex>
 #include <string>
+#include <exception>
 
 START_NAMESPACE_STIR
 

src/recon_test/test_FBP2D.cxx

@@ -14,6 +14,7 @@
 
 #include "stir/recon_buildblock/test/ReconstructionTests.h"
 #include "stir/analytic/FBP2D/FBP2DReconstruction.h"
+#include <exception>
 
 START_NAMESPACE_STIR
 
@@ -96,7 +97,7 @@ TestFBP2D::run_tests()
         // we shouldn't get here
         everything_ok = false;
       }
-    catch (...)
+    catch (std::runtime_error&)
       {}
   }
 }

src/recon_test/test_OSMAPOSL.cxx

@@ -14,6 +14,7 @@
 
 #include "stir/recon_buildblock/test/PoissonLLReconstructionTests.h"
 #include "stir/OSMAPOSL/OSMAPOSLReconstruction.h"
+#include <exception>
 
 START_NAMESPACE_STIR
 
@@ -88,7 +89,7 @@ TestOSMAPOSL::run_tests()
           // we shouldn't get here
           everything_ok = false;
         }
-      catch (...)
+      catch (std::runtime_error&)
         {}
     }
 }

src/recon_test/test_blocks_on_cylindrical_projectors.cxx

@@ -449,7 +449,7 @@ BlocksTests::run_voxelOnCartesianGrid_with_negative_offset()
       auto grid = std::make_shared<VoxelsOnCartesianGrid<float>>(
           *proj_data_info_blocks_sptr, 1, CartesianCoordinate3D<float>(0.F, 0.F, 0.F), CartesianCoordinate3D<int>(-1, -1, -1));
     }
-  catch (...)
+  catch (std::runtime_error&)
     {
       is_ok = false;
     }

src/test/IO/test_IO_ITKMulticomponent.cxx

@@ -69,6 +69,11 @@ IOTests_ITKMulticomponent::run_tests()
       check_if_equal<float>(voxels_coords->get_voxel_size()[2], 4.0625F);
       check_if_equal<float>(voxels_coords->get_voxel_size()[3], 4.0625F);
     }
+  catch (const std::exception& error)
+    {
+      std::cerr << "\nHere's the error:\n\t" << error.what() << "\n\n";
+      everything_ok = false;
+    }
   catch (...)
     {
       everything_ok = false;

src/test/test_Array.cxx

@@ -494,7 +494,7 @@ ArrayTests::run_tests()
           {
             t2.at(-4).at(3);
           }
-        catch (...)
+        catch (std::out_of_range&)
           {
             exception_thrown = true;
           }

src/test/test_DateTime.cxx

@@ -74,7 +74,7 @@ DateTimeTest::run_tests()
         DICOM_datetime_to_secs_since_Unix_epoch("19710202230301+020");
         check(false, "test ill-formed TZ");
       }
-    catch (...)
+    catch (std::runtime_error&)
       {
         std::cerr << "Test was ok\n";
       }
@@ -108,7 +108,7 @@ DateTimeTest::run_tests()
         Interfile_datetime_to_secs_since_Unix_epoch(DateTimeStrings("1971:02:2", "23:03:01"));
         check(false, "test ill-formed date");
       }
-    catch (...)
+    catch (std::runtime_error&)
       {
         std::cerr << "Test was ok\n";
       }
@@ -154,7 +154,7 @@ DateTimeTest::check_round_trip(const double secs, const double tz_offset, const
         check_if_zero(new_secs - secs, str + " : " + dt.date + ", " + dt.time);
       }
     }
-  catch (...)
+  catch (std::runtime_error&)
     {
       check(false, str);
     }

src/test/test_KeyParser.cxx

@@ -23,6 +23,7 @@
 #include <sstream>
 #include <vector>
 #include <algorithm>
+#include <exception>
 #include "stir/RunTests.h"
 
 START_NAMESPACE_STIR
@@ -142,7 +143,7 @@ KeyParserTests::run_tests_one_type()
         parser.parse(str);
         check(false, "parsing non-vectorised key with vector should have failed");
       }
-    catch (...)
+    catch (std::runtime_error&)
       {
         // ok
       }
@@ -161,7 +162,7 @@ KeyParserTests::run_tests_one_type()
         parser.parse(str);
         check(false, "parsing vectorised key with non-vector should have failed");
       }
-    catch (...)
+    catch (std::runtime_error&)
       {
         // ok
       }

src/test/test_ScatterSimulation.cxx

@@ -439,7 +439,7 @@ ScatterSimulationTests::test_scatter_simulation()
         test_symmetric(*sss, "act_zoom_rings_zoomxy.3_zoomz.4");
         check(false, "Test on zooming of activity image should have thrown.");
       }
-    catch (...)
+    catch (std::runtime_error&)
       {
         // ok
       }

src/test/test_proj_data.cxx

@@ -36,6 +36,7 @@
 #include "stir/CPUTimer.h"
 #include <algorithm>
 #include <numeric>
+#include <exception>
 
 START_NAMESPACE_STIR
 
@@ -321,7 +322,7 @@ ProjDataTests::run_tests_on_proj_data(ProjData& proj_data)
         proj_data2.fill(proj_data);
         check(false, "test fill wtih too small proj_data should have thrown");
       }
-    catch (...)
+    catch (std::runtime_error&)
       {
         // ok
       }

src/test/test_proj_data_in_memory.cxx

@@ -148,7 +148,7 @@ ProjDataInMemoryTests::run_tests_no_tof()
         proj_data2.fill(proj_data);
         check(false, "test fill with too small proj_data should have thrown");
       }
-    catch (...)
+    catch (std::runtime_error&)
       {
         // ok
       }
@@ -261,7 +261,7 @@ ProjDataInMemoryTests::run_tests_tof()
         proj_data2.fill(proj_data);
         check(false, "test fill with too small proj_data should have thrown");
       }
-    catch (...)
+    catch (std::runtime_error&)
       {
         // ok
       }