From 4340c977641036e7aa8ae5dcb69ccb3cac1df3c5 Mon Sep 17 00:00:00 2001
From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Mon, 29 Jun 2015 10:53:51 +0200
Subject: [PATCH] [mc] Fix include guards

---
 src/mc/AddressSpace.hpp   | 4 ++--
 src/mc/ModelChecker.hpp   | 4 ++--
 src/mc/PageStore.hpp      | 8 +++-----
 src/mc/RegionSnapshot.hpp | 6 +++---
 src/mc/mc_base.h          | 4 ++--
 src/mc/mc_client.h        | 4 ++--
 src/mc/mc_comm_pattern.h  | 6 +++---
 src/mc/mc_forward.h       | 4 ++--
 src/mc/mc_hash.hpp        | 6 +++---
 src/mc/mc_ignore.h        | 5 +++++
 src/mc/mc_liveness.h      | 4 ++--
 src/mc/mc_location.h      | 4 ++--
 src/mc/mc_memory_map.h    | 4 ++--
 src/mc/mc_mmalloc.h       | 4 ++--
 src/mc/mc_mmu.h           | 4 ++--
 src/mc/mc_object_info.h   | 4 ++--
 src/mc/mc_private.h       | 4 ++--
 src/mc/mc_process.h       | 4 ++--
 src/mc/mc_protocol.h      | 4 ++--
 src/mc/mc_record.h        | 4 ++--
 src/mc/mc_replay.h        | 4 ++--
 src/mc/mc_request.h       | 6 +++---
 src/mc/mc_safety.h        | 4 ++--
 src/mc/mc_server.h        | 4 ++--
 src/mc/mc_smx.h           | 4 ++--
 src/mc/mc_snapshot.h      | 4 ++--
 src/mc/mc_state.h         | 4 ++--
 src/mc/mc_unw.h           | 4 ++--
 src/mc/mcer_ignore.h      | 5 +++++
 29 files changed, 69 insertions(+), 61 deletions(-)

diff --git a/src/mc/AddressSpace.hpp b/src/mc/AddressSpace.hpp
index 1da65e81cd..4481e45fa2 100644
--- a/src/mc/AddressSpace.hpp
+++ b/src/mc/AddressSpace.hpp
@@ -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. */
 
-#ifndef MC_ADDRESS_SPACE_H
-#define MC_ADDRESS_SPACE_H
+#ifndef SIMGRID_MC_ADDRESS_SPACE_H
+#define SIMGRID_MC_ADDRESS_SPACE_H
 
 #include <cstdint>
 #include <type_traits>
diff --git a/src/mc/ModelChecker.hpp b/src/mc/ModelChecker.hpp
index f9a13427e4..fe50841917 100644
--- a/src/mc/ModelChecker.hpp
+++ b/src/mc/ModelChecker.hpp
@@ -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. */
  
-#ifndef MC_MODEL_CHECKER_H
-#define MC_MODEL_CHECKER_H
+#ifndef SIMGRID_MC_MODEL_CHECKER_HPP
+#define SIMGRID_MC_MODEL_CHECKER_HPP
 
 #include <sys/types.h>
 
diff --git a/src/mc/PageStore.hpp b/src/mc/PageStore.hpp
index 3491f587e0..f1d84d3396 100644
--- a/src/mc/PageStore.hpp
+++ b/src/mc/PageStore.hpp
@@ -4,25 +4,23 @@
 /* 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_PAGESTORE_HPP
+#define SIMGRID_MC_PAGESTORE_HPP
+
 #include <stdint.h>
 
-#ifdef __cplusplus
 #include <vector>
 
 #include <boost/array.hpp>
 #include <boost/utility.hpp>
 #include <boost/unordered_map.hpp>
 #include <boost/unordered_set.hpp>
-#endif
 
 #include <xbt.h>
 
 #include "mc_mmu.h"
 #include "mc_forward.h"
 
-#ifndef MC_PAGE_STORE_H
-#define MC_PAGE_STORE_H
-
 namespace simgrid {
 namespace mc {
 
diff --git a/src/mc/RegionSnapshot.hpp b/src/mc/RegionSnapshot.hpp
index a5f1946586..5e09e62065 100644
--- a/src/mc/RegionSnapshot.hpp
+++ b/src/mc/RegionSnapshot.hpp
@@ -4,15 +4,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_REGION_SNAPSHOT_HPP
+#define SIMGRID_MC_REGION_SNAPSHOT_HPP
+
 #include <cstddef>
 #include <utility>
 
 #include "PageStore.hpp"
 #include "AddressSpace.hpp"
 
-#ifndef SIMGRID_MC_REGION_SNAPSHOT_HPP
-#define SIMGRID_MC_REGION_SNAPSHOT_HPP
-
 namespace simgrid {
 namespace mc {
 
diff --git a/src/mc/mc_base.h b/src/mc/mc_base.h
index c3a63c1bf1..45b3cb5658 100644
--- a/src/mc/mc_base.h
+++ b/src/mc/mc_base.h
@@ -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. */
 
-#ifndef MC_BASE_H
-#define MC_BASE_H
+#ifndef SIMGRID_MC_BASE_H
+#define SIMGRID_MC_BASE_H
 
 #include <xbt/misc.h>
 #include <simgrid/simix.h>
diff --git a/src/mc/mc_client.h b/src/mc/mc_client.h
index c919dc8428..589e625e13 100644
--- a/src/mc/mc_client.h
+++ b/src/mc/mc_client.h
@@ -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. */
 
-#ifndef MC_CLIENT_H
-#define MC_CLIENT_H
+#ifndef SIMGRID_MC_CLIENT_H
+#define SIMGRID_MC_CLIENT_H
 
 #include <xbt/misc.h>
 #include "mc_protocol.h"
diff --git a/src/mc/mc_comm_pattern.h b/src/mc/mc_comm_pattern.h
index 0f503928ef..54a70363bc 100644
--- a/src/mc/mc_comm_pattern.h
+++ b/src/mc/mc_comm_pattern.h
@@ -4,6 +4,9 @@
 /* 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_COMM_PATTERN_H
+#define SIMGRID_MC_COMM_PATTERN_H
+
 #include <stdint.h>
 
 #include <simgrid_config.h>
@@ -15,9 +18,6 @@
 
 #include "mc_state.h"
 
-#ifndef MC_COMM_PATTERN_H
-#define MC_COMM_PATTERN_H
-
 SG_BEGIN_DECL()
 
 typedef struct s_mc_comm_pattern{
diff --git a/src/mc/mc_forward.h b/src/mc/mc_forward.h
index 725382bf7a..a247eba802 100644
--- a/src/mc/mc_forward.h
+++ b/src/mc/mc_forward.h
@@ -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. */
 
-#ifndef MC_FORWARD_H
-#define MC_FORWARD_H
+#ifndef SIMGRID_MC_FORWARD_H
+#define SIMGRID_MC_FORWARD_H
 
 #include <xbt/misc.h>
 #include <mc/datatypes.h>
diff --git a/src/mc/mc_hash.hpp b/src/mc/mc_hash.hpp
index 5362e180a3..bcf43c46bd 100644
--- a/src/mc/mc_hash.hpp
+++ b/src/mc/mc_hash.hpp
@@ -4,6 +4,9 @@
 /* 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_HASH_HPP
+#define SIMGRID_MC_HASH_HPP
+
 #include <stdio.h>
 #include <stdint.h>
 
@@ -12,9 +15,6 @@
 #include "xbt/misc.h"
 #include "mc_snapshot.h"
 
-#ifndef SIMGRID_MC_HASH_HPP
-#define SIMGRID_MC_HASH_HPP
-
 /** \brief Hash the current state
  *  \param num_state number of states
  *  \param stacks stacks (mc_snapshot_stak_t) used fot the stack unwinding informations
diff --git a/src/mc/mc_ignore.h b/src/mc/mc_ignore.h
index b5ac593ae6..05986fbdbb 100644
--- a/src/mc/mc_ignore.h
+++ b/src/mc/mc_ignore.h
@@ -3,6 +3,9 @@
 /* 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
+
 #include <xbt/dynar.h>
 
 #include "mc/datatypes.h"
@@ -17,3 +20,5 @@ XBT_INTERNAL void MC_stack_area_add(stack_region_t stack_area);
 XBT_INTERNAL xbt_dynar_t MC_checkpoint_ignore_new(void);
 
 SG_END_DECL();
+
+#endif
diff --git a/src/mc/mc_liveness.h b/src/mc/mc_liveness.h
index f7edd2e8f4..57f77f74d9 100644
--- a/src/mc/mc_liveness.h
+++ b/src/mc/mc_liveness.h
@@ -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. */
 
-#ifndef MC_LIVENESS_H
-#define MC_LIVENESS_H
+#ifndef SIMGRID_MC_LIVENESS_H
+#define SIMGRID_MC_LIVENESS_H
 
 #include <stdint.h>
 
diff --git a/src/mc/mc_location.h b/src/mc/mc_location.h
index a3b3bb5841..d6f6fe435d 100644
--- a/src/mc/mc_location.h
+++ b/src/mc/mc_location.h
@@ -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. */
 
-#ifndef MC_OBJECT_LOCATION_H
-#define MC_OBJECT_LOCATION_H
+#ifndef SIMGRID_MC_OBJECT_LOCATION_H
+#define SIMGRID_MC_OBJECT_LOCATION_H
 
 #include <stdint.h>
 
diff --git a/src/mc/mc_memory_map.h b/src/mc/mc_memory_map.h
index afcbb70338..21f2bdd44f 100644
--- a/src/mc/mc_memory_map.h
+++ b/src/mc/mc_memory_map.h
@@ -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. */
 
-#ifndef MC_MEMORY_MAP_H
-#define MC_MEMORY_MAP_H
+#ifndef SIMGRID_MC_MEMORY_MAP_H
+#define SIMGRID_MC_MEMORY_MAP_H
 
 #include <cstdint>
 
diff --git a/src/mc/mc_mmalloc.h b/src/mc/mc_mmalloc.h
index 987bf89683..c1f5ffed84 100644
--- a/src/mc/mc_mmalloc.h
+++ b/src/mc/mc_mmalloc.h
@@ -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. */
 
-#ifndef MC_MMALLOC_H
-#define MC_MMALLOC_H
+#ifndef SIMGRID_MC_MMALLOC_H
+#define SIMGRID_MC_MMALLOC_H
 
 #include <xbt/misc.h>
 #include <xbt/mmalloc.h>
diff --git a/src/mc/mc_mmu.h b/src/mc/mc_mmu.h
index f097daccdd..25d10ceaa9 100644
--- a/src/mc/mc_mmu.h
+++ b/src/mc/mc_mmu.h
@@ -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. */
 
-#ifndef MC_MMU_H
-#define MC_MMU_H
+#ifndef SIMGRID_MC_MMU_H
+#define SIMGRID_MC_MMU_H
 
 #include <stdint.h>
 #include <stdbool.h>
diff --git a/src/mc/mc_object_info.h b/src/mc/mc_object_info.h
index 9dbf036ae8..b356884c09 100644
--- a/src/mc/mc_object_info.h
+++ b/src/mc/mc_object_info.h
@@ -8,8 +8,8 @@
  *  Debug information for the MC.
  */
 
-#ifndef MC_OBJECT_INFO_H
-#define MC_OBJECT_INFO_H
+#ifndef SIMGRID_MC_OBJECT_INFO_H
+#define SIMGRID_MC_OBJECT_INFO_H
 
 #include <stdint.h>
 #include <stdbool.h>
diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h
index 97f78273e8..6d8b02fc34 100644
--- a/src/mc/mc_private.h
+++ b/src/mc/mc_private.h
@@ -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. */
 
-#ifndef MC_PRIVATE_H
-#define MC_PRIVATE_H
+#ifndef SIMGRID_MC_PRIVATE_H
+#define SIMGRID_MC_PRIVATE_H
 
 #include <sys/types.h>
 
diff --git a/src/mc/mc_process.h b/src/mc/mc_process.h
index 4aba8c42c9..b357134907 100644
--- a/src/mc/mc_process.h
+++ b/src/mc/mc_process.h
@@ -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. */
 
-#ifndef MC_PROCESS_H
-#define MC_PROCESS_H
+#ifndef SIMGRID_MC_PROCESS_H
+#define SIMGRID_MC_PROCESS_H
 
 #include <type_traits>
 
diff --git a/src/mc/mc_protocol.h b/src/mc/mc_protocol.h
index c71c5540f6..440c5028ed 100644
--- a/src/mc/mc_protocol.h
+++ b/src/mc/mc_protocol.h
@@ -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. */
 
-#ifndef MC_PROTOCOL_H
-#define MC_PROTOCOL_H
+#ifndef SIMGRID_MC_PROTOCOL_H
+#define SIMGRID_MC_PROTOCOL_H
 
 #include <xbt/misc.h>
 
diff --git a/src/mc/mc_record.h b/src/mc/mc_record.h
index 1f7a677b9e..08c9af5180 100644
--- a/src/mc/mc_record.h
+++ b/src/mc/mc_record.h
@@ -14,8 +14,8 @@
  *  passed to the application (without the MC specific arguments).
  */
 
-#ifndef MC_RECORD_H
-#define MC_RECORD_H
+#ifndef SIMGRID_MC_RECORD_H
+#define SIMGRID_MC_RECORD_H
 
 #include <stdbool.h>
 
diff --git a/src/mc/mc_replay.h b/src/mc/mc_replay.h
index 2918305649..934a30e826 100644
--- a/src/mc/mc_replay.h
+++ b/src/mc/mc_replay.h
@@ -6,11 +6,11 @@
 /* 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/misc.h>
-
 #ifndef SIMGRID_MC_REPLAY_H
 #define SIMGRID_MC_REPLAY_H
 
+#include <xbt/misc.h>
+
 SG_BEGIN_DECL()
 
 /** Replay path (if any) in string representation
diff --git a/src/mc/mc_request.h b/src/mc/mc_request.h
index 33642d45dd..c70ad34e79 100644
--- a/src/mc/mc_request.h
+++ b/src/mc/mc_request.h
@@ -4,13 +4,13 @@
 /* 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_REQUEST_H
+#define SIMGRID_MC_REQUEST_H
+
 #include <simgrid_config.h>
 
 #include "../simix/smx_private.h"
 
-#ifndef MC_REQUEST_H
-#define MC_REQUEST_H
-
 SG_BEGIN_DECL()
 
 typedef enum e_mc_request_type {
diff --git a/src/mc/mc_safety.h b/src/mc/mc_safety.h
index 00e4a0f559..bd5ab1fe8c 100644
--- a/src/mc/mc_safety.h
+++ b/src/mc/mc_safety.h
@@ -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. */
 
-#ifndef MC_SAFETY_H
-#define MC_SAFETY_H
+#ifndef SIMGRID_MC_SAFETY_H
+#define SIMGRID_MC_SAFETY_H
 
 #include <stdint.h>
 
diff --git a/src/mc/mc_server.h b/src/mc/mc_server.h
index e1ed05d705..e2c1a2300a 100644
--- a/src/mc/mc_server.h
+++ b/src/mc/mc_server.h
@@ -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. */
 
-#ifndef MC_SERVER_H
-#define MC_SERVER_H
+#ifndef SIMGRID_MC_SERVER_H
+#define SIMGRID_MC_SERVER_H
 
 #include <poll.h>
 
diff --git a/src/mc/mc_smx.h b/src/mc/mc_smx.h
index 510bd2aab7..49d69be4d4 100644
--- a/src/mc/mc_smx.h
+++ b/src/mc/mc_smx.h
@@ -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. */
 
-#ifndef MC_SMX_H
-#define MC_SMX_H
+#ifndef SIMGRID_MC_SMX_H
+#define SIMGRID_MC_SMX_H
 
 #include <stddef.h>
 
diff --git a/src/mc/mc_snapshot.h b/src/mc/mc_snapshot.h
index 8d9ce91aa0..fc2ea78ff4 100644
--- a/src/mc/mc_snapshot.h
+++ b/src/mc/mc_snapshot.h
@@ -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. */
 
-#ifndef MC_SNAPSHOT_H
-#define MC_SNAPSHOT_H
+#ifndef SIMGRID_MC_SNAPSHOT_H
+#define SIMGRID_MC_SNAPSHOT_H
 
 #include <sys/types.h> // off_t
 #include <stdint.h> // size_t
diff --git a/src/mc/mc_state.h b/src/mc/mc_state.h
index f44ac485ab..152e7a07d8 100644
--- a/src/mc/mc_state.h
+++ b/src/mc/mc_state.h
@@ -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. */
 
-#ifndef MC_STATE_H
-#define MC_STATE_H
+#ifndef SIMGRID_MC_STATE_H
+#define SIMGRID_MC_STATE_H
 
 #include <simgrid_config.h>
 #include "../simix/smx_private.h"
diff --git a/src/mc/mc_unw.h b/src/mc/mc_unw.h
index 38287f19b4..eac812d778 100644
--- a/src/mc/mc_unw.h
+++ b/src/mc/mc_unw.h
@@ -5,8 +5,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 MC_UNW_H
-#define MC_UNW_H
+#ifndef SIMGRID_MC_UNW_H
+#define SIMGRID_MC_UNW_H
 
 /** \file
  *  Libunwind implementation for the model-checker
diff --git a/src/mc/mcer_ignore.h b/src/mc/mcer_ignore.h
index aa740df03c..3e806137c0 100644
--- a/src/mc/mcer_ignore.h
+++ b/src/mc/mcer_ignore.h
@@ -3,6 +3,9 @@
 /* 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_MCER_IGNORE_H
+#define SIMGRID_MCER_IGNORE_H
+
 #include <xbt/dynar.h>
 
 #include "mc/datatypes.h"
@@ -17,3 +20,5 @@ XBT_INTERNAL void MC_heap_region_ignore_insert(mc_heap_ignore_region_t region);
 XBT_INTERNAL void MC_heap_region_ignore_remove(void *address, size_t size);
 
 SG_END_DECL();
+
+#endif
\ No newline at end of file
-- 
2.20.1