Skip to content

Commit 00e89d3

Browse files
committed
Fix code to run through example in Linux
Signed-off-by: Yangbo Long <[email protected]>
1 parent f7c4531 commit 00e89d3

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/cpp/fastdds/xtypes/dynamic_types/idl_parser/IdlGrammar.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ struct fixed_pt_literal;
109109
struct integer_literal : seq<
110110
not_at<float_literal>,
111111
not_at<fixed_pt_literal>,
112-
sor<oct_literal, hex_literal, dec_literal>
112+
sor<hex_literal, oct_literal, dec_literal>
113113
> {};
114114

115115
// float literals

src/cpp/fastdds/xtypes/dynamic_types/idl_parser/IdlParser.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -691,8 +691,8 @@ struct action<boolean_literal>
691691
\
692692
std::istringstream ss(in.string()); \
693693
type value; \
694-
if (#id == "octal") ss >> std::setbase(std::ios_base::oct) >> value; \
695-
else if (#id == "hexa") ss >> std::setbase(std::ios_base::hex) >> value; \
694+
if (std::string{#id} == "octal") ss >> std::oct >> value; \
695+
else if (std::string{#id} == "hexa") ss >> std::hex >> value; \
696696
else ss >> value; \
697697
\
698698
DynamicTypeBuilderFactory::_ref_type factory {DynamicTypeBuilderFactory::get_instance()}; \
@@ -1108,10 +1108,10 @@ struct action<enum_dcl>
11081108
{
11091109
MemberDescriptor::_ref_type member_descriptor {traits<MemberDescriptor>::make_shared()};
11101110
member_descriptor->name(tokens[i]);
1111-
member_descriptor->type(factory->get_primitive_type(TK_UINT32));
1111+
member_descriptor->type(factory->get_primitive_type(TK_INT32));
11121112
builder->add_member(member_descriptor);
11131113

1114-
DynamicType::_ref_type member_type {factory->get_primitive_type(TK_UINT32)}; // TODO what about value?
1114+
DynamicType::_ref_type member_type {factory->get_primitive_type(TK_INT32)};
11151115
DynamicData::_ref_type member_data {DynamicDataFactory::get_instance()->create_data(member_type)};
11161116

11171117
module.create_constant(tokens[i], member_data, false, true); // Mark it as "from_enum"

0 commit comments

Comments
 (0)