BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-07-03 13:54:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

We already know the underlying_type.

Browse Source 
We just need to pass it to DEFINE_BITMASK_OPERATORS macro
This commit is contained in:
BogDan Vatra
2016-06-01 10:04:55 +03:00
parent 7d1f372ba6
commit 0b0cf58f24
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/flatbuffers/flatbuffers.h
View File

@@ -1485,21 +1485,17 @@ volatile __attribute__((weak)) const char *flatbuffer_version_string =
#endif // !defined(_WIN32) && !defined(__CYGWIN__) #endif // !defined(_WIN32) && !defined(__CYGWIN__)
#define DEFINE_BITMASK_OPERATORS(E)\ #define DEFINE_BITMASK_OPERATORS(E, T)\
inline E operator | (E lhs, E rhs){\ inline E operator | (E lhs, E rhs){\
using T = std::underlying_type<E>::type;\
return E(T(lhs) | T(rhs));\ return E(T(lhs) | T(rhs));\
}\ }\
inline E operator & (E lhs, E rhs){\ inline E operator & (E lhs, E rhs){\
using T = std::underlying_type<E>::type;\
return E(T(lhs) & T(rhs));\ return E(T(lhs) & T(rhs));\
}\ }\
inline E operator ^ (E lhs, E rhs){\ inline E operator ^ (E lhs, E rhs){\
using T = std::underlying_type<E>::type;\
return E(T(lhs) ^ T(rhs));\ return E(T(lhs) ^ T(rhs));\
}\ }\
inline E operator ~ (E lhs){\ inline E operator ~ (E lhs){\
using T = std::underlying_type<E>::type;\
return E(~T(lhs));\ return E(~T(lhs));\
}\ }\
inline E operator |= (E &lhs, E rhs){\ inline E operator |= (E &lhs, E rhs){\

2
src/idl_gen_cpp.cpp
View File

@@ -184,7 +184,7 @@ static void GenEnum(const Parser &parser, EnumDef &enum_def,
code += GenEnumVal(enum_def, maxv->name, parser.opts) + "\n"; code += GenEnumVal(enum_def, maxv->name, parser.opts) + "\n";
code += "};\n"; code += "};\n";
if (parser.opts.scoped_enums && enum_def.attributes.Lookup("bit_flags")) if (parser.opts.scoped_enums && enum_def.attributes.Lookup("bit_flags"))
code += "DEFINE_BITMASK_OPERATORS(" + enum_def.name + ")\n"; code += "DEFINE_BITMASK_OPERATORS(" + enum_def.name + ", " + GenTypeBasic(enum_def.underlying_type, false) + ")\n";
code += "\n"; code += "\n";
// Generate a generate string table for enum values. // Generate a generate string table for enum values.