From: Frederic Suter Date: Thu, 28 Nov 2019 14:24:07 +0000 (+0100) Subject: cosmetics (less SIMIX, more kernel) X-Git-Tag: v3.25~354 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/7b0e03ac48be8e014d877060fbd385201b1b896f?ds=sidebyside cosmetics (less SIMIX, more kernel) --- diff --git a/src/kernel/activity/ActivityImpl.hpp b/src/kernel/activity/ActivityImpl.hpp index cd98b6ad2c..df0a712d82 100644 --- a/src/kernel/activity/ActivityImpl.hpp +++ b/src/kernel/activity/ActivityImpl.hpp @@ -3,8 +3,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. */ -#ifndef SIMGRID_KERNEL_ACTIVITY_ACTIVITYIMPL_HPP -#define SIMGRID_KERNEL_ACTIVITY_ACTIVITYIMPL_HPP +#ifndef SIMGRID_KERNEL_ACTIVITY_ACTIVITY_HPP +#define SIMGRID_KERNEL_ACTIVITY_ACTIVITY_HPP #include #include diff --git a/src/kernel/activity/ConditionVariableImpl.hpp b/src/kernel/activity/ConditionVariableImpl.hpp index 7945f2a618..0095699f05 100644 --- a/src/kernel/activity/ConditionVariableImpl.hpp +++ b/src/kernel/activity/ConditionVariableImpl.hpp @@ -3,8 +3,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. */ -#ifndef SIMGRID_KERNEL_ACTIVITY_CONDITIONVARIABLEIMPL_HPP -#define SIMGRID_KERNEL_ACTIVITY_CONDITIONVARIABLEIMPL_HPP +#ifndef SIMGRID_KERNEL_ACTIVITY_CONDITIONVARIABLE_HPP +#define SIMGRID_KERNEL_ACTIVITY_CONDITIONVARIABLE_HPP #include "simgrid/s4u/ConditionVariable.hpp" #include "src/kernel/actor/ActorImpl.hpp" diff --git a/src/kernel/activity/ExecImpl.hpp b/src/kernel/activity/ExecImpl.hpp index 86ac8a3cb8..ab926752b9 100644 --- a/src/kernel/activity/ExecImpl.hpp +++ b/src/kernel/activity/ExecImpl.hpp @@ -3,8 +3,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. */ -#ifndef SIMIX_SYNCHRO_EXEC_HPP -#define SIMIX_SYNCHRO_EXEC_HPP +#ifndef SIMGRID_KERNEL_ACTIVITY_EXEC_HPP +#define SIMGRID_KERNEL_ACTIVITY_EXEC_HPP #include "src/kernel/activity/ActivityImpl.hpp" #include "src/kernel/context/Context.hpp" diff --git a/src/kernel/activity/IoImpl.hpp b/src/kernel/activity/IoImpl.hpp index 8d8f04c8c6..cbc2f0d185 100644 --- a/src/kernel/activity/IoImpl.hpp +++ b/src/kernel/activity/IoImpl.hpp @@ -3,8 +3,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. */ -#ifndef SIMIX_SYNCHRO_IO_HPP -#define SIMIX_SYNCHRO_IO_HPP +#ifndef SIMGRID_KERNEL_ACTIVITY_IO_HPP +#define SIMGRID_KERNEL_ACTIVITY_IO_HPP #include "src/kernel/activity/ActivityImpl.hpp" #include "surf/surf.hpp" diff --git a/src/kernel/activity/MailboxImpl.hpp b/src/kernel/activity/MailboxImpl.hpp index b176c76cea..e926f18a06 100644 --- a/src/kernel/activity/MailboxImpl.hpp +++ b/src/kernel/activity/MailboxImpl.hpp @@ -3,8 +3,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. */ -#ifndef SIMIX_MAILBOXIMPL_H -#define SIMIX_MAILBOXIMPL_H +#ifndef SIMGRID_KERNEL_ACTIVITY_MAILBOX_HPP +#define SIMGRID_KERNEL_ACTIVITY_MAILBOX_HPP #include #include diff --git a/src/kernel/activity/MutexImpl.hpp b/src/kernel/activity/MutexImpl.hpp index 3abf068229..3655e53b1e 100644 --- a/src/kernel/activity/MutexImpl.hpp +++ b/src/kernel/activity/MutexImpl.hpp @@ -3,8 +3,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. */ -#ifndef SIMIX_MUTEXIMPL_HPP -#define SIMIX_MUTEXIMPL_HPP +#ifndef SIMGRID_KERNEL_ACTIVITY_MUTEX_HPP +#define SIMGRID_KERNEL_ACTIVITY_MUTEX_HPP #include "simgrid/s4u/ConditionVariable.hpp" #include "src/kernel/actor/ActorImpl.hpp" diff --git a/src/kernel/activity/SemaphoreImpl.hpp b/src/kernel/activity/SemaphoreImpl.hpp index e6dc57d6bb..961a15ad0e 100644 --- a/src/kernel/activity/SemaphoreImpl.hpp +++ b/src/kernel/activity/SemaphoreImpl.hpp @@ -3,8 +3,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. */ -#ifndef SIMGRID_KERNEL_ACTIVITY_SEMAPHOREIMPL_HPP_ -#define SIMGRID_KERNEL_ACTIVITY_SEMAPHOREIMPL_HPP_ +#ifndef SIMGRID_KERNEL_ACTIVITY_SEMAPHORE_HPP +#define SIMGRID_KERNEL_ACTIVITY_SEMAPHORE_HPP #include #include diff --git a/src/kernel/activity/SleepImpl.hpp b/src/kernel/activity/SleepImpl.hpp index ec5c9e271f..ca267f539b 100644 --- a/src/kernel/activity/SleepImpl.hpp +++ b/src/kernel/activity/SleepImpl.hpp @@ -3,8 +3,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. */ -#ifndef SIMIX_SYNCHRO_SLEEP_HPP -#define SIMIX_SYNCHRO_SLEEP_HPP +#ifndef SIMGRID_KERNEL_ACTIVITY_SLEEP_HPP +#define SIMGRID_KERNEL_ACTIVITY_SLEEP_HPP #include "src/kernel/activity/ActivityImpl.hpp" #include "surf/surf.hpp" diff --git a/src/kernel/activity/SynchroRaw.hpp b/src/kernel/activity/SynchroRaw.hpp index 13953ead95..62b62bc323 100644 --- a/src/kernel/activity/SynchroRaw.hpp +++ b/src/kernel/activity/SynchroRaw.hpp @@ -3,8 +3,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. */ -#ifndef SIMIX_SYNCHRO_RAW_HPP -#define SIMIX_SYNCHRO_RAW_HPP +#ifndef SIMGRID_KERNEL_ACTIVITY_SYNCHRO_RAW_HPP +#define SIMGRID_KERNEL_ACTIVITY_SYNCHRO_RAW_HPP #include "src/kernel/activity/ActivityImpl.hpp" #include "surf/surf.hpp" diff --git a/src/kernel/context/ContextBoost.hpp b/src/kernel/context/ContextBoost.hpp index c0adb53141..dafcedd051 100644 --- a/src/kernel/context/ContextBoost.hpp +++ b/src/kernel/context/ContextBoost.hpp @@ -3,8 +3,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. */ -#ifndef SIMGRID_SIMIX_BOOST_CONTEXT_HPP -#define SIMGRID_SIMIX_BOOST_CONTEXT_HPP +#ifndef SIMGRID_KERNEL_CONTEXT_BOOST_CONTEXT_HPP +#define SIMGRID_KERNEL_CONTEXT_BOOST_CONTEXT_HPP #include #if BOOST_VERSION < 106100 diff --git a/src/kernel/context/ContextRaw.hpp b/src/kernel/context/ContextRaw.hpp index 7d562966cf..af36f10525 100644 --- a/src/kernel/context/ContextRaw.hpp +++ b/src/kernel/context/ContextRaw.hpp @@ -3,8 +3,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. */ -#ifndef SIMGRID_SIMIX_RAW_CONTEXT_HPP -#define SIMGRID_SIMIX_RAW_CONTEXT_HPP +#ifndef SIMGRID_KERNEL_CONTEXT_RAW_CONTEXT_HPP +#define SIMGRID_KERNEL_CONTEXT_RAW_CONTEXT_HPP #include #include diff --git a/src/kernel/context/ContextSwapped.hpp b/src/kernel/context/ContextSwapped.hpp index a8973d159a..25f22c294f 100644 --- a/src/kernel/context/ContextSwapped.hpp +++ b/src/kernel/context/ContextSwapped.hpp @@ -3,8 +3,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. */ -#ifndef SIMGRID_SIMIX_SWAPPED_CONTEXT_HPP -#define SIMGRID_SIMIX_SWAPPED_CONTEXT_HPP +#ifndef SIMGRID_KERNEL_CONTEXT_SWAPPED_CONTEXT_HPP +#define SIMGRID_KERNEL_CONTEXT_SWAPPED_CONTEXT_HPP #include "src/kernel/context/Context.hpp" diff --git a/src/kernel/context/ContextThread.hpp b/src/kernel/context/ContextThread.hpp index 720e54b229..259aef0b7e 100644 --- a/src/kernel/context/ContextThread.hpp +++ b/src/kernel/context/ContextThread.hpp @@ -5,8 +5,8 @@ /* \file ThreadContext.hpp Context switching with native threads */ -#ifndef SIMGRID_SIMIX_THREAD_CONTEXT_HPP -#define SIMGRID_SIMIX_THREAD_CONTEXT_HPP +#ifndef SIMGRID_KERNEL_CONTEXT_THREAD_CONTEXT_HPP +#define SIMGRID_KERNEL_CONTEXT_THREAD_CONTEXT_HPP #include "simgrid/simix.hpp" #include "src/kernel/context/Context.hpp" diff --git a/src/kernel/context/ContextUnix.hpp b/src/kernel/context/ContextUnix.hpp index cec22ac4a3..d6db05bd4e 100644 --- a/src/kernel/context/ContextUnix.hpp +++ b/src/kernel/context/ContextUnix.hpp @@ -3,8 +3,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. */ -#ifndef SIMGRID_SIMIX_UNIX_CONTEXT_HPP -#define SIMGRID_SIMIX_UNIX_CONTEXT_HPP +#ifndef SIMGRID_KERNEL_CONTEXT_UNIX_CONTEXT_HPP +#define SIMGRID_KERNEL_CONTEXT_UNIX_CONTEXT_HPP #include /* context relative declarations */