Skip to content

Commit b8dc740

Browse files
committed
refactor(to_cpp1): avoid conflict with branch optional_typename
1 parent 259764d commit b8dc740

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

source/to_cpp1.h

+7-5
Original file line numberDiff line numberDiff line change
@@ -1722,10 +1722,12 @@ class cppfront
17221722
bool is_local_name = true,
17231723
bool is_qualified = false,
17241724
bool is_class_member_access = false,
1725-
bool emit_identifier = true
1725+
bool is_dependent = false,
1726+
bool emit_identifier = true
17261727
)
17271728
-> void
17281729
{ STACKINSTR
1730+
(void)is_dependent; // Avoid conflict with #533.
17291731
assert( n.identifier );
17301732
auto last_use = is_definite_last_use(n.identifier);
17311733

@@ -5220,7 +5222,7 @@ class cppfront
52205222
{
52215223
auto list = std::string{""};
52225224
if (parent->specialization_template_arguments) {
5223-
list = print_to_string(*parent->specialization_template_arguments, 0, false, false, false, false);
5225+
list = print_to_string(*parent->specialization_template_arguments, 0, false, false, false, false, false);
52245226
}
52255227
else if (parent->template_parameters) {
52265228
auto separator = std::string{"<"};
@@ -5907,7 +5909,7 @@ class cppfront
59075909

59085910
auto specialization_template_arguments = std::string{};
59095911
if (n.specialization_template_arguments) {
5910-
specialization_template_arguments = print_to_string(*n.specialization_template_arguments, 0, false, false, false, false);
5912+
specialization_template_arguments = print_to_string(*n.specialization_template_arguments, 0, false, false, false, false, false);
59115913
}
59125914

59135915
printer.print_cpp2(
@@ -6139,7 +6141,7 @@ class cppfront
61396141
printer.print_cpp2("class ", n.position());
61406142
emit(*n.identifier);
61416143
if (n.specialization_template_arguments) {
6142-
emit(*n.specialization_template_arguments, 0, false, false, false, false);
6144+
emit(*n.specialization_template_arguments, 0, false, false, false, false, false);
61436145
}
61446146

61456147
// Type declaration
@@ -7030,7 +7032,7 @@ class cppfront
70307032
else if (!n.is_object_with_function_typeid()) {
70317033
emit(*n.identifier);
70327034
if (n.specialization_template_arguments) {
7033-
emit(*n.specialization_template_arguments, 0, false, false, false, false);
7035+
emit(*n.specialization_template_arguments, 0, false, false, false, false, false);
70347036
}
70357037
}
70367038

0 commit comments

Comments
 (0)