PR review comments

Author: Galen Elias

clang/include/clang/Format/Format.h

@@ -5172,6 +5172,7 @@ struct FormatStyle {
                R.AllowShortIfStatementsOnASingleLine &&
            AllowShortLambdasOnASingleLine == R.AllowShortLambdasOnASingleLine &&
            AllowShortLoopsOnASingleLine == R.AllowShortLoopsOnASingleLine &&
+           AllowShortNamespacesOnASingleLine == R.AllowShortNamespacesOnASingleLine &&
            AlwaysBreakBeforeMultilineStrings ==
                R.AlwaysBreakBeforeMultilineStrings &&
            AttributeMacros == R.AttributeMacros &&

clang/lib/Format/UnwrappedLineFormatter.cpp

@@ -653,7 +653,7 @@ class LineJoiner {
       assert(Limit >= I[1]->Last->TotalLength + 3);
       const unsigned InnerLimit = Limit - I[1]->Last->TotalLength - 3;
       const unsigned MergedLines = tryMergeNamespace(I + 1, E, InnerLimit);
-      if (!MergedLines)
+      if (MergedLines == 0)
         return 0;
       const auto N = MergedLines + 2;
       // Check if there is even a line after the inner result.