From 4b7a195bd1cf7d18a557fa4a4f353a229e533126 Mon Sep 17 00:00:00 2001 From: Antonia Lechner Date: Fri, 25 May 2018 11:03:11 +0100 Subject: [PATCH] Improve naming of annotation variables This makes it easier to distinguish between variables of type annotationt and java_annotationt. --- jbmc/src/java_bytecode/java_bytecode_convert_class.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/jbmc/src/java_bytecode/java_bytecode_convert_class.cpp b/jbmc/src/java_bytecode/java_bytecode_convert_class.cpp index 178dddad5ea..915f536e5cf 100644 --- a/jbmc/src/java_bytecode/java_bytecode_convert_class.cpp +++ b/jbmc/src/java_bytecode/java_bytecode_convert_class.cpp @@ -1015,19 +1015,18 @@ static void find_and_replace_parameters( /// \param annotations: The java_annotationt collection to populate void convert_annotations( const java_bytecode_parse_treet::annotationst &parsed_annotations, - std::vector &annotations) + std::vector &java_annotations) { for(const auto &annotation : parsed_annotations) { - annotations.emplace_back(annotation.type); + java_annotations.emplace_back(annotation.type); std::vector &values = - annotations.back().get_values(); + java_annotations.back().get_values(); std::transform( annotation.element_value_pairs.begin(), annotation.element_value_pairs.end(), std::back_inserter(values), - [](const decltype(annotation.element_value_pairs)::value_type &value) - { + [](const decltype(annotation.element_value_pairs)::value_type &value) { return java_annotationt::valuet(value.element_name, value.value); }); }