diff --git a/src/code_conversion.cpp b/src/code_conversion.cpp
index 2f253ed..d75d2a6 100644
--- a/src/code_conversion.cpp
+++ b/src/code_conversion.cpp
@@ -125,6 +125,7 @@ inline std::size_t code_convert(const SourceCharT* begin, const SourceCharT* end
                 // Looks like the tail of the source buffer contains only part of the last character.
                 // In this case we intentionally fall through to throw an exception.
             }
+            BOOST_FALLTHROUGH;
 
         default: // std::codecvt_base::error
             BOOST_LOG_THROW_DESCR(conversion_error, "Could not convert character encoding");
diff --git a/src/named_scope_format_parser.cpp b/src/named_scope_format_parser.cpp
index b7a602a..b393259 100644
--- a/src/named_scope_format_parser.cpp
+++ b/src/named_scope_format_parser.cpp
@@ -124,12 +124,13 @@ bool detect_operator(const char* begin, const char* end, const char* operator_ke
             return true;
         }
         // Fall through to other cases involving '-'
+        BOOST_FALLTHROUGH;
 
     case '=':
     case '|':
     case '&':
     case '+':
-        // Handle operator=, operator==, operator+=, operator++, operator||, opeartor&&, etc.
+        // Handle operator=, operator==, operator+=, operator++, operator||, operator&&, etc.
         if (end - p >= 2 && (p[0] == p[1] || p[1] == '='))
             operator_end = p + 2;
         else
@@ -295,6 +296,7 @@ inline const char* find_opening_parenthesis(const char* begin, const char* end,
                 }
             }
             // Fall through to process this character as other characters
+            BOOST_FALLTHROUGH;
 
         default:
             if (state != operator_detected)
@@ -358,6 +360,7 @@ inline const char* find_closing_parenthesis(const char* begin, const char* end,
                 }
             }
             // Fall through to process this character as other characters
+            BOOST_FALLTHROUGH;
 
         default:
             if (!found_first_meaningful_char && c != ' ')