Merge pull request #381

zeek · Nov 16, 2023 · 69d9eae · 69d9eae
2 parents 98491e0 + 02ac91b
commit 69d9eae
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,7 @@
+2.8.0-dev.7 | 2023-11-16 16:54:09 +0100
+
+  * Fix error::context (Dominik Charousset, Corelight)
+
 2.8.0-dev.5 | 2023-11-13 19:52:09 -0800
 
   * Fix Github edit links in top-right of HTML pages (Christian Kreibich, Corelight)

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.8.0-dev.5
+2.8.0-dev.7
diff --git a/src/error.cc b/src/error.cc
@@ -144,10 +144,9 @@ const std::string* error::message() const noexcept {
 
 const endpoint_info* error::context() const noexcept {
   auto& msg = native(*this).context();
-  if (auto v = caf::make_const_typed_message_view<endpoint_info>(msg))
-    return std::addressof(get<0>(v));
-  else
-    return nullptr;
+  if (msg.match_element<endpoint_info>(0))
+    return std::addressof(msg.get_as<endpoint_info>(0));
+  return nullptr;
 }
 
 error::impl* error::native_ptr() noexcept {