Tidy #includes in a few files.

Following review of a recent change to move regex definitions into
their own files, this commit ensures that #include directives are
separated into categories and sorted alphabetically within the
categories, subject to known ordering constraints (such as "config.h"
first, "abg-internal.h" before visibility directives etc.).

There are no behavioural changes.

	* src/abg-corpus-priv.h: Separate and sort #include
	directives.
	* src/abg-corpus.cc: Ditto.
	* src/abg-regex.cc: Ditto.
	* src/abg-suppression-priv.h: Ditto.
	* src/abg-suppression.cc: Ditto.

Signed-off-by: Giuliano Procida <gprocida@google.com>
This commit is contained in:
Giuliano Procida 2020-05-04 13:34:02 +01:00 committed by Dodji Seketeli
parent 40423cb54a
commit 1bcfdfd6bd
5 changed files with 14 additions and 10 deletions

View File

@ -29,9 +29,9 @@
#ifndef __ABG_CORPUS_PRIV_H__
#define __ABG_CORPUS_PRIV_H__
#include "abg-sptr-utils.h"
#include "abg-regex.h"
#include "abg-internal.h"
#include "abg-regex.h"
#include "abg-sptr-utils.h"
namespace abigail
{

View File

@ -21,23 +21,25 @@
/// @file
#include "config.h"
#include <algorithm>
#include <cassert>
#include <cstdio>
#include <cstring>
#include <cassert>
#include <stdexcept>
#include <algorithm>
#include "abg-cxx-compat.h"
#include "abg-internal.h"
// <headers defining libabigail's API go under here>
ABG_BEGIN_EXPORT_DECLARATIONS
#include "abg-sptr-utils.h"
#include "abg-ir.h"
#include "abg-corpus.h"
#include "abg-ir.h"
#include "abg-reader.h"
#include "abg-writer.h"
#include "abg-sptr-utils.h"
#include "abg-tools-utils.h"
#include "abg-writer.h"
#if WITH_ZIP_ARCHIVE
#include "abg-libzip-utils.h"

View File

@ -24,8 +24,9 @@
///
#include <sstream>
#include "abg-sptr-utils.h"
#include "abg-regex.h"
#include "abg-sptr-utils.h"
namespace abigail
{

View File

@ -29,9 +29,9 @@
#define __ABG_SUPPRESSION_PRIV_H__
#include "abg-fwd.h"
#include "abg-suppression.h"
#include "abg-sptr-utils.h"
#include "abg-regex.h"
#include "abg-sptr-utils.h"
#include "abg-suppression.h"
namespace abigail
{

View File

@ -26,6 +26,7 @@
/// libabigail.
#include <algorithm>
#include "abg-cxx-compat.h"
#include "abg-internal.h"