Two little fixes

openPMD · Nov 28, 2023 · 3948173 · 3948173
1 parent fe602e0
commit 3948173
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/include/openPMD/auxiliary/DerefDynamicCast.hpp b/include/openPMD/auxiliary/DerefDynamicCast.hpp
@@ -22,6 +22,7 @@
 
 #include <optional>
 #include <stdexcept>
+#include <typeinfo>
 
 namespace openPMD
 {
@@ -64,10 +65,17 @@ namespace auxiliary
     inline std::optional<New_Type *>
     dynamic_cast_optional(Old_Type *ptr) noexcept
     {
-        auto const tmp_ptr = dynamic_cast<New_Type *>(ptr);
-        if (tmp_ptr == nullptr)
+        try
+        {
+            auto const tmp_ptr = dynamic_cast<New_Type *>(ptr);
+            if (tmp_ptr == nullptr)
+                return std::nullopt;
+            return {tmp_ptr};
+        }
+        catch (std::bad_cast const &)
+        {
             return std::nullopt;
-        return {tmp_ptr};
+        }
     }
 
 } // namespace auxiliary

diff --git a/src/Mesh.cpp b/src/Mesh.cpp
@@ -264,7 +264,7 @@ namespace
     {
         for (auto [unit, exponent] : udim)
         {
-            *(it + static_cast<uint8_t>(unit)) = exponent;
+            it[static_cast<uint8_t>(unit)] = exponent;
         }
     }
 } // namespace