From 084e5dbc4b170a828add67e81601f3c2c80cc481 Mon Sep 17 00:00:00 2001 From: lakedaemon Date: Fri, 8 Jul 2016 22:00:15 +0200 Subject: [PATCH 1/2] fixed initialization of member var for old make (hopefully) --- src/idl_gen_cpp.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp index c690240d6..61ef6ff1b 100644 --- a/src/idl_gen_cpp.cpp +++ b/src/idl_gen_cpp.cpp @@ -39,7 +39,8 @@ class CppGenerator : public BaseGenerator { public: CppGenerator(const Parser &parser, const std::string &path, const std::string &file_name) - : BaseGenerator(parser, path, file_name, "", "::"){}; + : BaseGenerator(parser, path, file_name, "", "::"), + cur_name_space_(nullptr){}; // Iterate through all definitions we haven't generate code for (enums, // structs, // and tables) and output them to a single file. @@ -206,7 +207,7 @@ class CppGenerator : public BaseGenerator { private: // This tracks the current namespace so we can insert namespace declarations. - const Namespace *cur_name_space_ = nullptr; + const Namespace *cur_name_space_; const Namespace *CurrentNameSpace() { return cur_name_space_; } From 8e1aae0fd69c2bf4eb0ff5ed7af44983d04de9df Mon Sep 17 00:00:00 2001 From: lakedaemon Date: Fri, 8 Jul 2016 22:02:47 +0200 Subject: [PATCH 2/2] fix missing space (clang format) --- src/idl_gen_cpp.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp index 61ef6ff1b..6cdae16c9 100644 --- a/src/idl_gen_cpp.cpp +++ b/src/idl_gen_cpp.cpp @@ -39,8 +39,8 @@ class CppGenerator : public BaseGenerator { public: CppGenerator(const Parser &parser, const std::string &path, const std::string &file_name) - : BaseGenerator(parser, path, file_name, "", "::"), - cur_name_space_(nullptr){}; + : BaseGenerator(parser, path, file_name, "", "::"), + cur_name_space_(nullptr){}; // Iterate through all definitions we haven't generate code for (enums, // structs, // and tables) and output them to a single file.