diff --git a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp
index c8acb1fd4..6daddfdf6 100644
--- a/src/idl_gen_cpp.cpp
+++ b/src/idl_gen_cpp.cpp
@@ -733,8 +733,8 @@ class CppGenerator : public BaseGenerator {
     code_ += "  if (values->size() != types->size()) return false;";
     code_ += "  for (flatbuffers::uoffset_t i = 0; i < values->size(); ++i) {";
     code_ += "    if (!Verify" + enum_def.name + "(";
-    code_ += "        verifier,  values->Get(i), types->GetEnum<" + enum_def.name + ">(i))) { ";
-    code_ += "      return false; ";
+    code_ += "        verifier,  values->Get(i), types->GetEnum<" + enum_def.name + ">(i))) {";
+    code_ += "      return false;";
     code_ += "    }";
     code_ += "  }";
     code_ += "  return true;";
diff --git a/tests/test.cpp b/tests/test.cpp
index 02a8b8265..74f98ff54 100644
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -1302,7 +1302,7 @@ void UnionVectorTest() {
   std::vector<flatbuffers::Offset<void>> characters;
   characters.push_back(CreateBelle(fbb, /*books_read=*/7).Union());
   characters.push_back(CreateRapunzel(fbb, /*hair_length=*/6).Union());
-  characters.push_back(CreateMuLan(fbb, /*sward_attack_damage=*/5).Union());
+  characters.push_back(CreateMuLan(fbb, /*sword_attack_damage=*/5).Union());
 
   // create Movie.
   const auto movie_offset =