From 3bfd904a3c447ca85508b7a6fdf9837cd2b1db0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johel=20Ernesto=20Guerrero=20Pe=C3=B1a?= Date: Mon, 11 Dec 2023 21:02:09 -0400 Subject: [PATCH] refactor(to_cpp1): avoid conflict with branch `optional_typename` --- source/to_cpp1.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/source/to_cpp1.h b/source/to_cpp1.h index 575880c4ad..66af411bd7 100644 --- a/source/to_cpp1.h +++ b/source/to_cpp1.h @@ -1699,10 +1699,12 @@ class cppfront bool in_synthesized_multi_return = false, bool is_local_name = true, bool is_qualified = false, + bool is_dependent = false, bool emit_identifier = true ) -> void { STACKINSTR + (void)is_dependent; // Avoid conflict with #533. auto last_use = is_definite_last_use(n.identifier); bool add_forward = @@ -4887,7 +4889,7 @@ class cppfront { auto list = std::string{""}; if (parent->specialization_template_arguments) { - list = print_to_string(*parent->specialization_template_arguments, false, false, false, false); + list = print_to_string(*parent->specialization_template_arguments, false, false, false, false, false); } else if (parent->template_parameters) { auto separator = std::string{"<"}; @@ -5551,7 +5553,7 @@ class cppfront auto specialization_template_arguments = std::string{}; if (n.specialization_template_arguments) { - specialization_template_arguments = print_to_string(*n.specialization_template_arguments, false, false, false, false); + specialization_template_arguments = print_to_string(*n.specialization_template_arguments, false, false, false, false, false); } printer.print_cpp2( @@ -5773,7 +5775,7 @@ class cppfront printer.print_cpp2("class ", n.position()); emit(*n.identifier); if (n.specialization_template_arguments) { - emit(*n.specialization_template_arguments, false, false, false, false); + emit(*n.specialization_template_arguments, false, false, false, false, false); } // Type declaration @@ -6633,7 +6635,7 @@ class cppfront else { emit(*n.identifier); if (n.specialization_template_arguments) { - emit(*n.specialization_template_arguments, false, false, false, false); + emit(*n.specialization_template_arguments, false, false, false, false, false); } }