From b214e39a03bf14bd65f62bd8742aa56e2aa0bd3e Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Tue, 2 Mar 2021 20:54:07 +0100 Subject: [PATCH] Rename mc_base.h -> .hpp (it's C++ only anyway). --- MANIFEST.in | 2 +- src/mc/inspect/LocationList.hpp | 2 +- src/mc/mc_base.cpp | 2 +- src/mc/{mc_base.h => mc_base.hpp} | 13 ++++--------- src/mc/mc_record.cpp | 2 +- src/xbt/mmalloc/mm_legacy.c | 1 - tools/cmake/DefinePackages.cmake | 2 +- 7 files changed, 9 insertions(+), 15 deletions(-) rename src/mc/{mc_base.h => mc_base.hpp} (93%) diff --git a/MANIFEST.in b/MANIFEST.in index acc1fb806b..ca71a3a365 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -2246,7 +2246,7 @@ include src/mc/inspect/mc_unw.cpp include src/mc/inspect/mc_unw.hpp include src/mc/inspect/mc_unw_vmread.cpp include src/mc/mc_base.cpp -include src/mc/mc_base.h +include src/mc/mc_base.hpp include src/mc/mc_client_api.cpp include src/mc/mc_comm_pattern.hpp include src/mc/mc_config.cpp diff --git a/src/mc/inspect/LocationList.hpp b/src/mc/inspect/LocationList.hpp index 2de26d7afe..3380494101 100644 --- a/src/mc/inspect/LocationList.hpp +++ b/src/mc/inspect/LocationList.hpp @@ -10,7 +10,7 @@ #include "xbt/range.hpp" #include "src/mc/inspect/DwarfExpression.hpp" -#include "src/mc/mc_base.h" +#include "src/mc/mc_base.hpp" #include "src/mc/mc_forward.hpp" #include diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp index 3788cd4d7f..3b44ac8d73 100644 --- a/src/mc/mc_base.cpp +++ b/src/mc/mc_base.cpp @@ -3,7 +3,7 @@ /* 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 "src/mc/mc_base.h" +#include "src/mc/mc_base.hpp" #include "mc/mc.h" #include "src/kernel/activity/CommImpl.hpp" #include "src/kernel/activity/MutexImpl.hpp" diff --git a/src/mc/mc_base.h b/src/mc/mc_base.hpp similarity index 93% rename from src/mc/mc_base.h rename to src/mc/mc_base.hpp index 189388f509..30d4d15f20 100644 --- a/src/mc/mc_base.h +++ b/src/mc/mc_base.hpp @@ -3,13 +3,10 @@ /* 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. */ -#ifndef SIMGRID_MC_BASE_H -#define SIMGRID_MC_BASE_H +#ifndef SIMGRID_MC_BASE_HPP +#define SIMGRID_MC_BASE_HPP #include "simgrid/forward.h" - -#ifdef __cplusplus - #include namespace simgrid { @@ -41,9 +38,7 @@ XBT_PRIVATE bool actor_is_enabled(smx_actor_t process); /** Check if the given simcall is visible */ XBT_PRIVATE bool request_is_visible(const s_smx_simcall* req); -} -} - -#endif +} // namespace mc +} // namespace simgrid #endif diff --git a/src/mc/mc_record.cpp b/src/mc/mc_record.cpp index 38321e4a89..6e3fd31f2a 100644 --- a/src/mc/mc_record.cpp +++ b/src/mc/mc_record.cpp @@ -7,7 +7,7 @@ #include "src/kernel/activity/CommImpl.hpp" #include "src/kernel/context/Context.hpp" #include "src/mc/Transition.hpp" -#include "src/mc/mc_base.h" +#include "src/mc/mc_base.hpp" #include "src/mc/mc_replay.hpp" #if SIMGRID_HAVE_MC diff --git a/src/xbt/mmalloc/mm_legacy.c b/src/xbt/mmalloc/mm_legacy.c index 81230d16fa..7ab16fd035 100644 --- a/src/xbt/mmalloc/mm_legacy.c +++ b/src/xbt/mmalloc/mm_legacy.c @@ -13,7 +13,6 @@ #include "mmprivate.h" #include "src/internal_config.h" -#include "src/mc/mc_base.h" #include "src/mc/remote/mc_protocol.h" #include "src/xbt_modinter.h" #include diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index bb7865239d..548a950d00 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -573,7 +573,7 @@ set(JEDULE_SRC set(MC_SRC_BASE src/mc/mc_base.cpp - src/mc/mc_base.h + src/mc/mc_base.hpp src/mc/mc_record.hpp src/mc/mc_replay.hpp src/mc/mc_record.cpp -- 2.20.1