[PATCH 1/3] abidiff.cc: tidy using directives and declarations

Giuliano Procida gprocida@google.com
Mon May 4 16:24:37 GMT 2020


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 <gprocida@google.com>
---
 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



More information about the Libabigail mailing list