Merge pull request 'Replace MOZ_FALLTHROUGH with [[fallthrough]]' (#2379) from 2343-fallthrough-work into master

Reviewed-on: https://repo.palemoon.org/MoonchildProductions/UXP/pulls/2379

2 files changed, 2 insertions, 2 deletions

diff --git a/mailnews/base/search/src/nsMsgFilterService.cpp b/mailnews/base/search/src/nsMsgFilterService.cpp
index c8f52de5aa..9fd0c23e55 100644
--- a/mailnews/base/search/src/nsMsgFilterService.cpp
+++ b/mailnews/base/search/src/nsMsgFilterService.cpp
@@ -609,7 +609,7 @@ nsresult nsMsgFilterAfterTheFact::ApplyFilter()
         //   would not have run if move succeeded.
         m_nextAction = numActions;
         // Fall through to the copy case.
-        MOZ_FALLTHROUGH;
+        [[fallthrough]];
       case nsMsgFilterAction::CopyToFolder:
       {
         nsCString uri;
diff --git a/mailnews/base/search/src/nsMsgSearchAdapter.cpp b/mailnews/base/search/src/nsMsgSearchAdapter.cpp
index a6f8778305..52a76a9dd1 100644
--- a/mailnews/base/search/src/nsMsgSearchAdapter.cpp
+++ b/mailnews/base/search/src/nsMsgSearchAdapter.cpp
@@ -334,7 +334,7 @@ nsresult nsMsgSearchAdapter::EncodeImapTerm (nsIMsgSearchTerm *term, bool really
   case nsMsgSearchAttrib::ToOrCC:
     orHeaderMnemonic = m_kImapCC;
     // fall through to case nsMsgSearchAttrib::To:
-    MOZ_FALLTHROUGH;
+    [[fallthrough]];
   case nsMsgSearchAttrib::To:
     whichMnemonic = m_kImapTo;
     break;