Use only the ID of a message when removing it from context

3 files changed, 5 insertions, 4 deletions

diff --git a/src/catch2/internal/catch_message_info.hpp b/src/catch2/internal/catch_message_info.hpp
index bd686d6d..8c18186b 100644
--- a/src/catch2/internal/catch_message_info.hpp
+++ b/src/catch2/internal/catch_message_info.hpp
@@ -26,6 +26,7 @@ namespace Catch {
         std::string message;
         SourceLineInfo lineInfo;
         ResultWas::OfType type;
+        // The "ID" of the message, used to know when to remove it from reporter context.
         unsigned int sequence;
 
         DEPRECATED( "Explicitly use the 'sequence' member instead" )
diff --git a/src/catch2/internal/catch_run_context.cpp b/src/catch2/internal/catch_run_context.cpp
index d1cec82c..b6edddb3 100644
--- a/src/catch2/internal/catch_run_context.cpp
+++ b/src/catch2/internal/catch_run_context.cpp
@@ -487,7 +487,7 @@ namespace Catch {
         Detail::g_messages.push_back( message );
     }
 
-    void RunContext::popScopedMessage( MessageInfo const& message ) {
+    void RunContext::popScopedMessage( unsigned int messageId ) {
         // Note: On average, it would probably be better to look for the message
         //       backwards. However, we do not expect to have to deal with more
         //       messages than low single digits, so the optimization is tiny,
@@ -496,8 +496,8 @@ namespace Catch {
         Detail::g_messages.erase(
             std::find_if( Detail::g_messages.begin(),
                           Detail::g_messages.end(),
-                          [id = message.sequence]( MessageInfo const& msg ) {
-                              return msg.sequence == id;
+                          [=]( MessageInfo const& msg ) {
+                              return msg.sequence == messageId;
                           } ) );
     }
 
diff --git a/src/catch2/internal/catch_run_context.hpp b/src/catch2/internal/catch_run_context.hpp
index 39aca522..892926a0 100644
--- a/src/catch2/internal/catch_run_context.hpp
+++ b/src/catch2/internal/catch_run_context.hpp
@@ -95,7 +95,7 @@ namespace Catch {
         void benchmarkFailed( StringRef error ) override;
 
         void pushScopedMessage( MessageInfo const& message ) override;
-        void popScopedMessage( MessageInfo const& message ) override;
+        void popScopedMessage( unsigned int messageId ) override;
 
         void emplaceUnscopedMessage( MessageBuilder&& builder ) override;