From 25069d9824ebe6c730df979a4a96676e96fb9b80 Mon Sep 17 00:00:00 2001
From: Thorsten Hater <24411438+thorstenhater@users.noreply.github.com>
Date: Thu, 3 Aug 2023 20:43:24 +0200
Subject: [PATCH] Merge fallout

---
 arbor/fvm_layout.cpp | 2 +-
 arbor/mechcat.cpp    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arbor/fvm_layout.cpp b/arbor/fvm_layout.cpp
index 502702c413..27d6ce4a18 100644
--- a/arbor/fvm_layout.cpp
+++ b/arbor/fvm_layout.cpp
@@ -343,7 +343,7 @@ fvm_cv_discretize(const cable_cell& cell, const cable_cell_parameter_set& global
                 auto sc = ie->eval(provider, cable);
                 if (def <= 0.0 || std::isnan(def)) {
                     throw make_cc_error("Illegal diffusivity '{}' for ion '{}' at cable {}."
-                                        " Please check your expressions.", sc, ion, cable);
+                                        " Please check your expressions.", sc, ion, to_string(cable));
                 }
                 return sc;
             };
diff --git a/arbor/mechcat.cpp b/arbor/mechcat.cpp
index 4488bf648b..e20849e294 100644
--- a/arbor/mechcat.cpp
+++ b/arbor/mechcat.cpp
@@ -605,7 +605,7 @@ ARB_ARBOR_API const mechanism_catalogue load_catalogue(const std::filesystem::pa
         throw bad_catalogue_error{e.what(), {e}};
     }
     if (!get_catalogue) {
-        throw bad_catalogue_error{fmt::format("Unusable symbol 'get_catalogue' in shared object '{}'", fn)};
+        throw bad_catalogue_error{fmt::format("Unusable symbol 'get_catalogue' in shared object '{}'", fn.string())};
     }
     /* The DSO handle is not freed here: handles will be retained until
      * termination since the mechanisms provided by the catalogue may have a
@@ -615,14 +615,14 @@ ARB_ARBOR_API const mechanism_catalogue load_catalogue(const std::filesystem::pa
     int count = -1;
     auto mechs = (arb_mechanism*)get_catalogue(&count);
     if (count <= 0) {
-        throw bad_catalogue_error{fmt::format("Invalid mechanism count {} in shared object '{}'", count, fn)};
+        throw bad_catalogue_error{fmt::format("Invalid mechanism count {} in shared object '{}'", count, fn.string())};
     }
     mechanism_catalogue result;
     for(int ix = 0; ix < count; ++ix) {
         auto type = mechs[ix].type();
         auto name = std::string{type.name};
         if (name.empty()) {
-            throw bad_catalogue_error{fmt::format("Empty name for mechanism in '{}'", fn)};
+            throw bad_catalogue_error{fmt::format("Empty name for mechanism in '{}'", fn.string())};
         }
         auto icpu = mechs[ix].i_cpu();
         auto igpu = mechs[ix].i_gpu();