aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgbeili <gbeili@users.noreply.github.com>2017-01-25 09:34:37 -0800
committerWouter van Oortmerssen <aardappel@gmail.com>2017-01-25 09:34:37 -0800
commitfd61d70205f5ba887b53feeadba6060753d12c4e (patch)
tree4ae66af51b641546ba46a80fa3c3f9bb4d6ed45f
parent4f4495a6932bb52c45f513bd42214aab81c89419 (diff)
downloadflatbuffers-fd61d70205f5ba887b53feeadba6060753d12c4e.tar.gz
minor fixes to the union vector code styles (#4149)
-rw-r--r--src/idl_gen_cpp.cpp4
-rw-r--r--tests/test.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp
index c8acb1fd..6daddfdf 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 02a8b826..74f98ff5 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 =