Rename instr_interface.h and mc_ignore.h to .hpp.

diff --git a/src/include/instr/instr_interface.h b/src/include/instr/instr_interface.hpp
similarity index 79%
rename from src/include/instr/instr_interface.h
rename to src/include/instr/instr_interface.hpp
index e31aea6..e4cdb94 100644 (file)
--- a/src/include/instr/instr_interface.h
+++ b/src/include/instr/instr_interface.hpp
@@ -3,18 +3,14 @@
 /* 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_INSTR_INTERFACE_H
-#define SIMGRID_INSTR_INTERFACE_H
+#ifndef SIMGRID_INSTR_INTERFACE_HPP
+#define SIMGRID_INSTR_INTERFACE_HPP
 
 #include "xbt.h"
 
-SG_BEGIN_DECL()
-
 XBT_PUBLIC int TRACE_start();
 XBT_PUBLIC int TRACE_end();
 XBT_PUBLIC void TRACE_global_init();
 XBT_PUBLIC void TRACE_help(int detailed);
 
-SG_END_DECL()
-
 #endif

diff --git a/src/instr/instr_private.hpp b/src/instr/instr_private.hpp
index dc421da..4245fbe 100644 (file)
--- a/src/instr/instr_private.hpp
+++ b/src/instr/instr_private.hpp
@@ -8,7 +8,7 @@
 
 #include <xbt/base.h>
 
-#include "instr/instr_interface.h"
+#include "instr/instr_interface.hpp"
 #include "simgrid/instr.h"
 #include "simgrid_config.h"
 #include "src/instr/instr_paje_containers.hpp"

diff --git a/src/kernel/context/Context.hpp b/src/kernel/context/Context.hpp
index 9b788b2..5d2b69d 100644 (file)
--- a/src/kernel/context/Context.hpp
+++ b/src/kernel/context/Context.hpp
@@ -6,7 +6,7 @@
 #ifndef SIMGRID_KERNEL_CONTEXT_CONTEXT_HPP
 #define SIMGRID_KERNEL_CONTEXT_CONTEXT_HPP
 
-#include "instr/instr_interface.h"
+#include "instr/instr_interface.hpp"
 #include "src/internal_config.h"
 #include "src/simix/smx_network_private.hpp"
 

diff --git a/src/kernel/context/ContextUnix.cpp b/src/kernel/context/ContextUnix.cpp
index 5b9cf2f..e3df168 100644 (file)
--- a/src/kernel/context/ContextUnix.cpp
+++ b/src/kernel/context/ContextUnix.cpp
@@ -8,7 +8,7 @@
 #include "ContextUnix.hpp"
 
 #include "mc/mc.h"
-#include "src/mc/mc_ignore.h"
+#include "src/mc/mc_ignore.hpp"
 #include "src/simix/ActorImpl.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);

diff --git a/src/mc/mc_client_api.cpp b/src/mc/mc_client_api.cpp
index 8b2512d..68279a7 100644 (file)
--- a/src/mc/mc_client_api.cpp
+++ b/src/mc/mc_client_api.cpp
@@ -9,7 +9,7 @@
 #include <simgrid/modelchecker.h>
 
 #include "src/mc/ModelChecker.hpp"
-#include "src/mc/mc_ignore.h"
+#include "src/mc/mc_ignore.hpp"
 #include "src/mc/mc_private.hpp"
 #include "src/mc/mc_record.hpp"
 #include "src/mc/remote/Client.hpp"

diff --git a/src/mc/mc_ignore.h b/src/mc/mc_ignore.hpp
similarity index 72%
rename from src/mc/mc_ignore.h
rename to src/mc/mc_ignore.hpp
index f146f50..595c04e 100644 (file)
--- a/src/mc/mc_ignore.h
+++ b/src/mc/mc_ignore.hpp
@@ -3,17 +3,15 @@
 /* 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_IGNORE_H
-#define SIMGRID_MC_IGNORE_H
+#ifndef SIMGRID_MC_IGNORE_HPP
+#define SIMGRID_MC_IGNORE_HPP
 
 #include "src/internal_config.h"
 
 #if HAVE_UCONTEXT_H
-#include <ucontext.h>           /* context relative declarations */
+#include <ucontext.h> /* context relative declarations */
 
-SG_BEGIN_DECL();
 XBT_PUBLIC void MC_register_stack_area(void* stack, smx_actor_t process, ucontext_t* context, size_t size);
-SG_END_DECL();
 
 #endif
 

diff --git a/src/msg/msg_global.cpp b/src/msg/msg_global.cpp
index 719640c..071d18a 100644 (file)
--- a/src/msg/msg_global.cpp
+++ b/src/msg/msg_global.cpp
@@ -6,7 +6,7 @@
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
 
-#include "instr/instr_interface.h"
+#include "instr/instr_interface.hpp"
 #include "mc/mc.h"
 #include "src/msg/msg_private.hpp"
 

diff --git a/src/s4u/s4u_engine.cpp b/src/s4u/s4u_engine.cpp
index ba75301..77c71e5 100644 (file)
--- a/src/s4u/s4u_engine.cpp
+++ b/src/s4u/s4u_engine.cpp
@@ -5,7 +5,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 "instr/instr_interface.h"
+#include "instr/instr_interface.hpp"
 #include "mc/mc.h"
 #include "simgrid/kernel/routing/NetPoint.hpp"
 #include "simgrid/kernel/routing/NetZoneImpl.hpp"

diff --git a/src/simdag/sd_global.cpp b/src/simdag/sd_global.cpp
index aafbc55..7bcdaf7 100644 (file)
--- a/src/simdag/sd_global.cpp
+++ b/src/simdag/sd_global.cpp
@@ -7,7 +7,7 @@
 #include "simgrid/kernel/resource/Action.hpp"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/sg_config.hpp"
-#include "src/include/instr/instr_interface.h"
+#include "src/include/instr/instr_interface.hpp"
 #include "src/surf/surf_interface.hpp"
 
 XBT_LOG_NEW_CATEGORY(sd, "Logging specific to SimDag");

diff --git a/src/simgrid/sg_config.cpp b/src/simgrid/sg_config.cpp
index 602f2ae..0c7c8a8 100644 (file)
--- a/src/simgrid/sg_config.cpp
+++ b/src/simgrid/sg_config.cpp
@@ -6,7 +6,7 @@
 /* sg_config: configuration infrastructure for the simulation world         */
 
 #include "simgrid/sg_config.hpp"
-#include "instr/instr_interface.h"
+#include "instr/instr_interface.hpp"
 #include "mc/mc.h"
 #include "simgrid/instr.h"
 #include "src/internal_config.h"

diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp
index 85296a9..2ed96e5 100644 (file)
--- a/src/surf/surf_interface.cpp
+++ b/src/surf/surf_interface.cpp
@@ -4,7 +4,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "surf_interface.hpp"
-#include "instr/instr_interface.h" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
+#include "instr/instr_interface.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
 #include "mc/mc.h"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/sg_config.hpp"

diff --git a/src/surf/xml/surfxml_parseplatf.cpp b/src/surf/xml/surfxml_parseplatf.cpp
index 87e1353..3edce86 100644 (file)
--- a/src/surf/xml/surfxml_parseplatf.cpp
+++ b/src/surf/xml/surfxml_parseplatf.cpp
@@ -3,12 +3,12 @@
 /* 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 "instr/instr_interface.h" // TRACE_start(). FIXME: remove by subscribing tracing to the surf signals
+#include "surf/surf.hpp"
+#include "instr/instr_interface.hpp" // TRACE_start(). FIXME: remove by subscribing tracing to the surf signals
 #include "src/surf/cpu_interface.hpp"
 #include "src/surf/network_interface.hpp"
 #include "src/surf/surf_interface.hpp"
 #include "src/surf/xml/platf_private.hpp"
-#include "surf/surf.hpp"
 
 #include <vector>
 

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 69ba68b..19a3eaa 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -2,7 +2,7 @@
 
 set(EXTRA_DIST
   src/bindings/java/MANIFEST.in
-  src/include/instr/instr_interface.h
+  src/include/instr/instr_interface.hpp
   src/include/mc/datatypes.h
   src/include/mc/mc.h
   src/include/simgrid/sg_config.hpp
@@ -634,7 +634,7 @@ set(MC_SRC
   src/mc/mc_dwarf_tagnames.cpp
   src/mc/mc_hash.hpp
   src/mc/mc_hash.cpp
-  src/mc/mc_ignore.h
+  src/mc/mc_ignore.hpp
   src/mc/LocationList.hpp
   src/mc/LocationList.cpp
   src/mc/mc_record.cpp