Skip to content

Commit 3bab396

Browse files
Merge pull request #164 from martinfantini/correct_enum_namepace
2 parents cb14af4 + e377326 commit 3bab396

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

src/fast_type_gen/hpp_gen.cpp

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -582,9 +582,16 @@ void hpp_gen::visit(const mfast::enum_field_instruction *inst, void *pIndex) {
582582

583583
if (inst->ref_instruction()) {
584584
std::string actual_type_name = cpp_type_of(inst, &dependency_);
585-
header_cref_ << indent << "typedef " << actual_type_name << "_cref " << name
585+
std::string enum_namespace;
586+
if (actual_type_name.find("mfast") == std::string::npos)
587+
{
588+
for (auto &&ns : outer_ns_)
589+
enum_namespace += ns + "::";
590+
enum_namespace += filebase_ + "::";
591+
}
592+
header_cref_ << indent << "typedef " << enum_namespace << actual_type_name << "_cref " << name
586593
<< "_cref;\n";
587-
header_mref_ << indent << "typedef " << actual_type_name << "_mref " << name
594+
header_mref_ << indent << "typedef " << enum_namespace << actual_type_name << "_mref " << name
588595
<< "_mref;\n";
589596
} else {
590597
// this is the enum definition

0 commit comments

Comments
 (0)