Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add flatc '--cpp_std' switch #5656

Merged
merged 8 commits into from
Dec 23, 2019
Merged

Add flatc '--cpp_std' switch #5656

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2e3b4a1
Add flatc '--cpp_std' switch and sandbox for C++17 code generator
vglavnyy Dec 8, 2019
c17e1ec
Fix --cpp_std values: c++0x, c++11, c++17
vglavnyy Dec 16, 2019
74454e3
Add 'cpp::CppStandard' enum
vglavnyy Dec 17, 2019
2d0b123
Add testing engine into test_cpp17
vglavnyy Dec 19, 2019
dfc4c9b
Rebase to upstream/master
vglavnyy Dec 19, 2019
0214897
Set default '--cpp-std C++0x'
vglavnyy Dec 19, 2019
d8a3f10
Fix code generation (--cpp_std C++11) in CMakeLists.txt
vglavnyy Dec 22, 2019
75fbd4d
Revert --cpp-std for the tests from explicit C++11 to flatc default v…
vglavnyy Dec 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add 'cpp::CppStandard' enum
  • Loading branch information
@vglavnyy
vglavnyy committed Dec 19, 2019
commit 74454e34940f04ea37ea0e2e0091ba8066342acc
15 changes: 9 additions & 6 deletions src/idl_gen_cpp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,17 @@ static std::string GeneratedFileName(const std::string &path,

namespace cpp {

enum CppStandard { CPP_STD_X0 = 0, CPP_STD_11, CPP_STD_17 };

// Extension of IDLOptions for cpp-generator.
struct IDLOptionsCpp : public IDLOptions {
vglavnyy marked this conversation as resolved.
Show resolved Hide resolved
// All fields start with 'g_' prefix to distinguish from the base IDLOptions.
int g_cpp_std; // Base version of C++ standard (0, 11, 17).
bool g_only_fixed_enums; // Generate underlaying type for all enums.
CppStandard g_cpp_std; // Base version of C++ standard.
bool g_only_fixed_enums; // Generate underlaying type for all enums.
// clang-format off
IDLOptionsCpp(const IDLOptions &opts)
: IDLOptions(opts),
g_cpp_std(11),
g_cpp_std(CPP_STD_11),
g_only_fixed_enums(true)
{}
// clang-format on
Expand Down Expand Up @@ -2989,12 +2991,13 @@ bool GenerateCPP(const Parser &parser, const std::string &path,
std::transform(cpp_std.begin(), cpp_std.end(), cpp_std.begin(), ToUpper);
if (cpp_std.empty() || cpp_std == "C++11") {
// Use the standard C++11 code generator.
opts.g_cpp_std = 11;
opts.g_cpp_std = cpp::CppStandard::CPP_STD_11;
opts.g_only_fixed_enums = true;
} else if (cpp_std == "C++0X") {
opts.g_cpp_std = 0;
opts.g_cpp_std = cpp::CppStandard::CPP_STD_X0;
opts.g_only_fixed_enums = false;
} else if (cpp_std == "C++17") {
opts.g_cpp_std = 17;
opts.g_cpp_std = cpp::CppStandard::CPP_STD_17;
// With c++17 generate strong enums only.
opts.scoped_enums = true;
// By default, prefixed_enums==true, reset it.
Expand Down