From db7487ee3ab1cac3252f064000752ec1274c1be3 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Tue, 26 Jul 2016 16:07:50 +0200 Subject: [PATCH] rename a C++-only header with the '.hpp' suffix --- examples/s4u/actions-comm/s4u_actions-comm.cpp | 2 +- examples/s4u/basic/s4u_basic.cpp | 3 +-- examples/s4u/basic/s4u_basic.h | 2 +- examples/s4u/basic/s4u_basic_deployment.cpp | 3 +-- examples/s4u/basic/s4u_basic_function.cpp | 2 +- examples/s4u/io/s4u_io.cpp | 2 +- examples/s4u/mutex/s4u_mutex.cpp | 2 +- include/simgrid/{s4u.h => s4u.hpp} | 0 tools/cmake/DefinePackages.cmake | 2 +- 9 files changed, 8 insertions(+), 10 deletions(-) rename include/simgrid/{s4u.h => s4u.hpp} (100%) diff --git a/examples/s4u/actions-comm/s4u_actions-comm.cpp b/examples/s4u/actions-comm/s4u_actions-comm.cpp index 51c89d3f37..3221411829 100644 --- a/examples/s4u/actions-comm/s4u_actions-comm.cpp +++ b/examples/s4u/actions-comm/s4u_actions-comm.cpp @@ -8,7 +8,7 @@ #include "simgrid/msg.h" #include "simgrid/simix.h" /* semaphores for the barrier */ #include -#include "simgrid/s4u.h" +#include "simgrid/s4u.hpp" XBT_LOG_NEW_DEFAULT_CATEGORY(actions, "Messages specific for this msg example"); int communicator_size = 0; diff --git a/examples/s4u/basic/s4u_basic.cpp b/examples/s4u/basic/s4u_basic.cpp index 7ee0a432c4..e5a0e21c2e 100644 --- a/examples/s4u/basic/s4u_basic.cpp +++ b/examples/s4u/basic/s4u_basic.cpp @@ -4,8 +4,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include - -#include +#include #include "s4u_basic.h" diff --git a/examples/s4u/basic/s4u_basic.h b/examples/s4u/basic/s4u_basic.h index f4e85e0d51..1cfdc83cf9 100644 --- a/examples/s4u/basic/s4u_basic.h +++ b/examples/s4u/basic/s4u_basic.h @@ -5,7 +5,7 @@ #include -#include "simgrid/s4u.h" +#include XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "a sample log category"); diff --git a/examples/s4u/basic/s4u_basic_deployment.cpp b/examples/s4u/basic/s4u_basic_deployment.cpp index f40b9aaf33..7b68d2a0d4 100644 --- a/examples/s4u/basic/s4u_basic_deployment.cpp +++ b/examples/s4u/basic/s4u_basic_deployment.cpp @@ -7,8 +7,7 @@ #include #include - -#include +#include #include "s4u_basic.h" diff --git a/examples/s4u/basic/s4u_basic_function.cpp b/examples/s4u/basic/s4u_basic_function.cpp index 97590563f6..c915ed7a37 100644 --- a/examples/s4u/basic/s4u_basic_function.cpp +++ b/examples/s4u/basic/s4u_basic_function.cpp @@ -8,7 +8,7 @@ #include -#include +#include #include "s4u_basic.h" diff --git a/examples/s4u/io/s4u_io.cpp b/examples/s4u/io/s4u_io.cpp index 9d0545e781..e9ebf578de 100644 --- a/examples/s4u/io/s4u_io.cpp +++ b/examples/s4u/io/s4u_io.cpp @@ -5,7 +5,7 @@ #include -#include "simgrid/s4u.h" +#include "simgrid/s4u.hpp" XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "a sample log category"); diff --git a/examples/s4u/mutex/s4u_mutex.cpp b/examples/s4u/mutex/s4u_mutex.cpp index 99102903b3..bffc85d414 100644 --- a/examples/s4u/mutex/s4u_mutex.cpp +++ b/examples/s4u/mutex/s4u_mutex.cpp @@ -8,7 +8,7 @@ #include -#include "simgrid/s4u.h" +#include "simgrid/s4u.hpp" #define NB_ACTOR 2 diff --git a/include/simgrid/s4u.h b/include/simgrid/s4u.hpp similarity index 100% rename from include/simgrid/s4u.h rename to include/simgrid/s4u.hpp diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 5c367a41d2..e5f1a61669 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -654,7 +654,7 @@ set(headers_to_install include/simgrid/s4u/mutex.hpp include/simgrid/s4u/conditionVariable.hpp include/simgrid/s4u/storage.hpp - include/simgrid/s4u.h + include/simgrid/s4u.hpp include/simgrid/plugins/energy.h include/smpi/mpi.h include/smpi/smpi.h -- 2.20.1