From 341cb255f174254622d3ab6c52dd6d3256b46465 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Fri, 26 May 2017 10:14:33 +0200 Subject: [PATCH] chop, chop, chop includes --- src/mc/Frame.hpp | 2 +- src/mc/LocationList.hpp | 2 +- src/mc/ModelChecker.cpp | 6 +++--- src/mc/Session.cpp | 2 +- src/mc/Session.hpp | 2 +- src/mc/mc_base.h | 3 +-- src/mc/mc_comm_pattern.h | 8 +------- src/mc/mc_config.cpp | 2 +- src/mc/mc_dwarf.hpp | 10 ++-------- src/mc/mc_global.cpp | 4 ++-- src/mc/mc_hash.hpp | 6 +----- src/mc/mc_mmu.h | 10 +--------- src/mc/mc_private.h | 16 +--------------- src/mc/mc_record.h | 6 ++---- src/mc/mc_request.h | 4 ---- src/mc/mc_safety.h | 9 --------- src/mc/mc_snapshot.h | 7 +------ 17 files changed, 20 insertions(+), 79 deletions(-) diff --git a/src/mc/Frame.hpp b/src/mc/Frame.hpp index e554e812f2..663ecf3dc7 100644 --- a/src/mc/Frame.hpp +++ b/src/mc/Frame.hpp @@ -11,7 +11,7 @@ #include #include "xbt/base.h" -#include +#include "xbt/range.hpp" #include "src/mc/mc_forward.hpp" #include "src/mc/LocationList.hpp" diff --git a/src/mc/LocationList.hpp b/src/mc/LocationList.hpp index 2985abd713..da1af221ce 100644 --- a/src/mc/LocationList.hpp +++ b/src/mc/LocationList.hpp @@ -16,7 +16,7 @@ #include #include "xbt/base.h" -#include +#include "xbt/range.hpp" #include "src/mc/mc_base.h" #include "src/mc/mc_forward.hpp" diff --git a/src/mc/ModelChecker.cpp b/src/mc/ModelChecker.cpp index 1a4f7028ff..2f443048fe 100644 --- a/src/mc/ModelChecker.cpp +++ b/src/mc/ModelChecker.cpp @@ -14,10 +14,10 @@ #include #include +#include "xbt/automaton.h" +#include "xbt/automaton.hpp" #include "xbt/log.h" -#include -#include -#include +#include "xbt/system_error.hpp" #include "simgrid/sg_config.h" diff --git a/src/mc/Session.cpp b/src/mc/Session.cpp index 6c4bd78a81..13f3d72b3e 100644 --- a/src/mc/Session.cpp +++ b/src/mc/Session.cpp @@ -10,10 +10,10 @@ #include #include "xbt/log.h" +#include "xbt/system_error.hpp" #include #include #include -#include #include "src/mc/Session.hpp" #include "src/mc/mc_state.h" diff --git a/src/mc/Session.hpp b/src/mc/Session.hpp index 60317a785b..8bc9f04a7f 100644 --- a/src/mc/Session.hpp +++ b/src/mc/Session.hpp @@ -12,9 +12,9 @@ #endif #include "xbt/sysdep.h" +#include "xbt/system_error.hpp" #include #include -#include #include diff --git a/src/mc/mc_base.h b/src/mc/mc_base.h index 12b87169d8..1f94f1b94b 100644 --- a/src/mc/mc_base.h +++ b/src/mc/mc_base.h @@ -6,8 +6,7 @@ #ifndef SIMGRID_MC_BASE_H #define SIMGRID_MC_BASE_H -#include "xbt/base.h" -#include +#include "simgrid/forward.h" #ifdef __cplusplus diff --git a/src/mc/mc_comm_pattern.h b/src/mc/mc_comm_pattern.h index 8838043f16..b5ac8410dd 100644 --- a/src/mc/mc_comm_pattern.h +++ b/src/mc/mc_comm_pattern.h @@ -6,16 +6,10 @@ #ifndef SIMGRID_MC_COMM_PATTERN_H #define SIMGRID_MC_COMM_PATTERN_H -#include - #include +#include "smpi/smpi.h" #include "xbt/dynar.h" -#include - -#include "src/simix/smx_private.h" -#include "src/smpi/private.h" -#include #include "src/mc/mc_state.h" diff --git a/src/mc/mc_config.cpp b/src/mc/mc_config.cpp index 4ad2251e96..b188bf7caa 100644 --- a/src/mc/mc_config.cpp +++ b/src/mc/mc_config.cpp @@ -4,8 +4,8 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ +#include "xbt/config.h" #include "xbt/log.h" -#include #include #include diff --git a/src/mc/mc_dwarf.hpp b/src/mc/mc_dwarf.hpp index 8187dd72b0..3e2d8e3741 100644 --- a/src/mc/mc_dwarf.hpp +++ b/src/mc/mc_dwarf.hpp @@ -1,18 +1,12 @@ -/* Copyright (c) 2008-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2008-2017. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#if !defined(SIMGRID_MC_DWARF_HPP) +#ifndef SIMGRID_MC_DWARF_HPP #define SIMGRID_MC_DWARF_HPP -#include - -#include - #include "xbt/base.h" -#include "xbt/sysdep.h" #define DW_LANG_Objc DW_LANG_ObjC /* fix spelling error in older dwarf.h */ #include diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp index 33f0d619b2..8713d54aaa 100644 --- a/src/mc/mc_global.cpp +++ b/src/mc/mc_global.cpp @@ -12,9 +12,9 @@ #include +#include "xbt/automaton.h" #include "xbt/dynar.h" -#include -#include +#include "xbt/swag.h" #include "mc_base.h" diff --git a/src/mc/mc_hash.hpp b/src/mc/mc_hash.hpp index dc2e2d9e6a..d7af9b186a 100644 --- a/src/mc/mc_hash.hpp +++ b/src/mc/mc_hash.hpp @@ -1,5 +1,4 @@ -/* Copyright (c) 2007-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2007-2015. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -7,10 +6,7 @@ #ifndef SIMGRID_MC_HASH_HPP #define SIMGRID_MC_HASH_HPP -#include - #include "xbt/base.h" - #include "src/mc/mc_forward.hpp" namespace simgrid { diff --git a/src/mc/mc_mmu.h b/src/mc/mc_mmu.h index 608be2be0a..c7d5b976f1 100644 --- a/src/mc/mc_mmu.h +++ b/src/mc/mc_mmu.h @@ -6,15 +6,7 @@ #ifndef SIMGRID_MC_MMU_H #define SIMGRID_MC_MMU_H -#include -#include - -#include "xbt/asserts.h" -#include "xbt/base.h" // xbt_pagesize... -#include "xbt/misc.h" - -#include - +#include "xbt/misc.h" // xbt_pagesize... namespace simgrid { namespace mc { diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h index f4538d0577..0bdeb53563 100644 --- a/src/mc/mc_private.h +++ b/src/mc/mc_private.h @@ -6,22 +6,8 @@ #ifndef SIMGRID_MC_PRIVATE_H #define SIMGRID_MC_PRIVATE_H -#include "simgrid_config.h" - -#include - -#include - -#include "xbt/base.h" -#include -#include -#include - #include "mc/mc.h" -#include "mc/datatypes.h" -#include "src/mc/mc_base.h" - -#include "src/simix/smx_private.h" +#include "xbt/automaton.h" #ifdef __cplusplus #include "src/mc/mc_forward.hpp" diff --git a/src/mc/mc_record.h b/src/mc/mc_record.h index c1617fbdc5..56a341008c 100644 --- a/src/mc/mc_record.h +++ b/src/mc/mc_record.h @@ -17,12 +17,10 @@ #ifndef SIMGRID_MC_RECORD_H #define SIMGRID_MC_RECORD_H -#include -#include - +#include "src/mc/Transition.hpp" #include "xbt/base.h" -#include "src/mc/Transition.hpp" +#include namespace simgrid { namespace mc { diff --git a/src/mc/mc_request.h b/src/mc/mc_request.h index b635496b21..2672208d1c 100644 --- a/src/mc/mc_request.h +++ b/src/mc/mc_request.h @@ -6,10 +6,6 @@ #ifndef SIMGRID_MC_REQUEST_H #define SIMGRID_MC_REQUEST_H -#include - -#include "xbt/base.h" - #include "src/simix/smx_private.h" namespace simgrid { diff --git a/src/mc/mc_safety.h b/src/mc/mc_safety.h index 22b061503c..2c31b5d76d 100644 --- a/src/mc/mc_safety.h +++ b/src/mc/mc_safety.h @@ -6,17 +6,8 @@ #ifndef SIMGRID_MC_SAFETY_H #define SIMGRID_MC_SAFETY_H -#include - -#include - -#include - #include "xbt/base.h" -#include "src/mc/mc_forward.hpp" -#include "src/mc/mc_state.h" - namespace simgrid { namespace mc { diff --git a/src/mc/mc_snapshot.h b/src/mc/mc_snapshot.h index 68e9fdadce..fb0c109e50 100644 --- a/src/mc/mc_snapshot.h +++ b/src/mc/mc_snapshot.h @@ -6,18 +6,13 @@ #ifndef SIMGRID_MC_SNAPSHOT_H #define SIMGRID_MC_SNAPSHOT_H -#include -#include - #include #include #include #include -#include // off_t - #include "src/xbt/mmalloc/mmprivate.h" -#include "xbt/asserts.h" +//#include "xbt/asserts.h" #include "xbt/base.h" #include "src/mc/ModelChecker.hpp" -- 2.20.1