From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <31UGwXggKChY2BDAy4zw2AA270.yA874xwx42w47EAGDy0IwD0.AD2@flex--gprocida.bounces.google.com> Received: from mail-qv1-xf49.google.com (mail-qv1-xf49.google.com [IPv6:2607:f8b0:4864:20::f49]) by sourceware.org (Postfix) with ESMTPS id 9EE2A388B02D for ; Mon, 4 May 2020 16:24:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 9EE2A388B02D Received: by mail-qv1-xf49.google.com with SMTP id bm3so39268qvb.0 for ; Mon, 04 May 2020 09:24:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=J5WWkb92yk+qkYSDcsrhSYhThfUyK0Z44EQ5ErG6zvM=; b=pKJnf3O6jBmQjEAPIAjWtEI/HWEeolNgcmqUGbk5OAiFuR7ksh0Bto1izvgBfsbaQ/ oSknKykfDsE68jeYaD+7XovRqxkyxQ1wroINqOEj15AvSILn6bvO2hRytmGnykitGqqI pZfn4zQnaR3s94hMfHlTzZ5YhzRj4+rp+O84DqqR6OiELVghKkEpO/pYzeFzqvZl6rQz 70xuLF475D6KzWpg4B0anr2rWNrgwl33TTO7oF1bHA3FnEqcHDxWAWBTmgwQBcIy/5/T 7dPgGz5nXh3AA9xMbihn4RU//s7P1dvz+At4Mc5IBPhddd8cRp++HOLqfyC4IamfwrlB d6ow== X-Gm-Message-State: AGi0Pua0nxeY47ii4VgpgtzwbyijSCvwLVnicT7OgAqcKb3i+Dfk/1FT phcJ81vMGI3fNFyS1zoxKSWLFtAugT6dZKzZnak/b9CdymSeTrBOu15vU3zfuViE8Z5gKhzB9Rv KuOUEEYEBwnWul3p/6nL7DO9VUf3Zr4tyJprY8ou476Z6lhCFLwzn0li6052x9KHoAxYseBY= X-Google-Smtp-Source: APiQypLpDR3a54sAp6km9BHk79iq1q/RyToOuhEk8aUsSDroLJW5yjJn0mztvYw+WiH9a/9Sy8WVh3n4JhmxDQ== X-Received: by 2002:a05:6214:13e4:: with SMTP id ch4mr17649527qvb.123.1588609493120; Mon, 04 May 2020 09:24:53 -0700 (PDT) Date: Mon, 4 May 2020 17:24:37 +0100 In-Reply-To: <20200504162439.74028-1-gprocida@google.com> Message-Id: <20200504162439.74028-2-gprocida@google.com> Mime-Version: 1.0 References: <20200504162439.74028-1-gprocida@google.com> X-Mailer: git-send-email 2.26.2.526.g744177e7f7-goog Subject: [PATCH 1/3] abidiff.cc: tidy using directives and declarations From: Giuliano Procida To: libabigail@sourceware.org Cc: dodji@seketeli.org, kernel-team@android.com, gprocida@google.com, maennich@google.com Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-25.7 required=5.0 tests=BAYES_00, DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libabigail@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libabigail mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 May 2020 16:24:55 -0000 This patch replaces a using directive with a couple of specific using declarations, moves a couple of globally-scoped using declarations to the top of the file and alphabetically sorts all the using declarations. * tools/abidiff.cc: Eliminate using directive. Move stray using declarations to top of file and sort all using declarations. Signed-off-by: Giuliano Procida --- tools/abidiff.cc | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/tools/abidiff.cc b/tools/abidiff.cc index 162d5ebc..cffe5ab5 100644 --- a/tools/abidiff.cc +++ b/tools/abidiff.cc @@ -33,36 +33,39 @@ #include "abg-reader.h" #include "abg-dwarf-reader.h" -using std::vector; -using std::string; -using std::ostream; -using std::cout; -using std::cerr; using abg_compat::shared_ptr; -using abigail::ir::environment; -using abigail::ir::environment_sptr; -using abigail::translation_unit; -using abigail::translation_unit_sptr; -using abigail::corpus_sptr; -using abigail::corpus_group_sptr; -using abigail::comparison::translation_unit_diff_sptr; +using abigail::comparison::compute_diff; using abigail::comparison::corpus_diff; using abigail::comparison::corpus_diff_sptr; -using abigail::comparison::compute_diff; -using abigail::comparison::get_default_harmless_categories_bitmap; +using abigail::comparison::diff_context; +using abigail::comparison::diff_context_sptr; using abigail::comparison::get_default_harmful_categories_bitmap; +using abigail::comparison::get_default_harmless_categories_bitmap; +using abigail::comparison::translation_unit_diff_sptr; +using abigail::corpus_group_sptr; +using abigail::corpus_sptr; +using abigail::dwarf_reader::STATUS_ALT_DEBUG_INFO_NOT_FOUND; +using abigail::dwarf_reader::STATUS_DEBUG_INFO_NOT_FOUND; +using abigail::ir::environment; +using abigail::ir::environment_sptr; +using abigail::suppr::read_suppressions; using abigail::suppr::suppression_sptr; using abigail::suppr::suppressions_type; -using abigail::suppr::read_suppressions; -using namespace abigail::dwarf_reader; -using abigail::tools_utils::emit_prefix; +using abigail::tools_utils::abidiff_status; using abigail::tools_utils::check_file; -using abigail::tools_utils::guess_file_type; +using abigail::tools_utils::emit_prefix; using abigail::tools_utils::gen_suppr_spec_from_headers; using abigail::tools_utils::gen_suppr_spec_from_kernel_abi_whitelists; +using abigail::tools_utils::guess_file_type; using abigail::tools_utils::load_default_system_suppressions; using abigail::tools_utils::load_default_user_suppressions; -using abigail::tools_utils::abidiff_status; +using abigail::translation_unit; +using abigail::translation_unit_sptr; +using std::cerr; +using std::cout; +using std::ostream; +using std::string; +using std::vector; struct options { @@ -625,9 +628,6 @@ display_symtabs(const corpus_sptr c1, const corpus_sptr c2, ostream& o) o << (*i)->get_pretty_representation() << std::endl; } -using abigail::comparison::diff_context_sptr; -using abigail::comparison::diff_context; - /// Check that the suppression specification files supplied are /// present. If not, emit an error on stderr. /// -- 2.26.2.526.g744177e7f7-goog