Cosmetics: make #endif's comment match #ifndef.

diff --git a/examples/s4u/app-bittorrent/s4u-tracker.hpp b/examples/s4u/app-bittorrent/s4u-tracker.hpp
index a69d8a6..08fd911 100644 (file)
--- a/examples/s4u/app-bittorrent/s4u-tracker.hpp
+++ b/examples/s4u/app-bittorrent/s4u-tracker.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. */
 
 /* 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 BITTORRENT_TRACKER_HPP_
-#define BITTORRENT_TRACKER_HPP_
+#ifndef BITTORRENT_TRACKER_HPP
+#define BITTORRENT_TRACKER_HPP

 
 #include "s4u-bittorrent.hpp"
 #include <set>
 
 #include "s4u-bittorrent.hpp"
 #include <set>

diff --git a/examples/s4u/dht-kademlia/node.hpp b/examples/s4u/dht-kademlia/node.hpp
index 504fe40..dc36ae2 100644 (file)
--- a/examples/s4u/dht-kademlia/node.hpp
+++ b/examples/s4u/dht-kademlia/node.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. */
 
 /* 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 _KADEMLIA_NODE_HPP
-#define _KADEMLIA_NODE_HPP
+#ifndef KADEMLIA_NODE_HPP
+#define KADEMLIA_NODE_HPP

 #include "answer.hpp"
 #include "message.hpp"
 #include "routing_table.hpp"
 #include "answer.hpp"
 #include "message.hpp"
 #include "routing_table.hpp"


@@ -40,4 +40,4 @@ public:
 unsigned int get_id_in_prefix(unsigned int id, unsigned int prefix);
 unsigned int get_node_prefix(unsigned int id, unsigned int nb_bits);
 
 unsigned int get_id_in_prefix(unsigned int id, unsigned int prefix);
 unsigned int get_node_prefix(unsigned int id, unsigned int nb_bits);
 

-#endif /* _MSG_EXAMPLES_ROUTING_H */
+#endif /* KADEMLIA_NODE_HPP */

diff --git a/include/simgrid/s4u/Link.hpp b/include/simgrid/s4u/Link.hpp
index c2e6453..832bd3e 100644 (file)
--- a/include/simgrid/s4u/Link.hpp
+++ b/include/simgrid/s4u/Link.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. */
 
 /* 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 S4U_LINK_HPP_
-#define S4U_LINK_HPP_
+#ifndef S4U_LINK_HPP
+#define S4U_LINK_HPP

 
 #include <simgrid/forward.h>
 #include <simgrid/kernel/resource/Action.hpp>
 
 #include <simgrid/forward.h>
 #include <simgrid/kernel/resource/Action.hpp>


@@ -102,4 +102,4 @@ public:
 } // namespace s4u
 } // namespace simgrid
 
 } // namespace s4u
 } // namespace simgrid
 

-#endif /* SURF_NETWORK_INTERFACE_HPP_ */
+#endif /* S4U_LINK_HPP */

diff --git a/include/simgrid/version.h.in b/include/simgrid/version.h.in
index 0a4875d..352988e 100644 (file)
--- a/include/simgrid/version.h.in
+++ b/include/simgrid/version.h.in
@@ -32,4 +32,4 @@ SG_END_DECL
 
 #define SIMGRID_VERSION_STRING "@SIMGRID_VERSION_STRING@"
 
 
 #define SIMGRID_VERSION_STRING "@SIMGRID_VERSION_STRING@"
 

-#endif /* SIMGRID_PUBLIC_CONFIG_H */
+#endif /* SIMGRID_VERSION_H */

diff --git a/include/xbt/ex.h b/include/xbt/ex.h
index 32e31d7..963d9b6 100644 (file)
--- a/include/xbt/ex.h
+++ b/include/xbt/ex.h
@@ -58,4 +58,4 @@ XBT_ATTRIB_NORETURN XBT_PUBLIC void xbt_throw_unimplemented(const char* file, in
 SG_END_DECL
 
 /** @} */
 SG_END_DECL
 
 /** @} */

-#endif                          /* __XBT_EX_H__ */
+#endif /* XBT_EX_H */

diff --git a/include/xbt/log.h b/include/xbt/log.h
index d77ec59..888d028 100644 (file)
--- a/include/xbt/log.h
+++ b/include/xbt/log.h
@@ -493,4 +493,4 @@ extern xbt_log_layout_t xbt_log_default_layout;
 #define XBT_HELP(...) XBT_CINFO(xbt_help, __VA_ARGS__)
 
 SG_END_DECL
 #define XBT_HELP(...) XBT_CINFO(xbt_help, __VA_ARGS__)
 
 SG_END_DECL

-#endif                          /* ! _XBT_LOG_H_ */
+#endif /* XBT_LOG_H */

diff --git a/include/xbt/mallocator.h b/include/xbt/mallocator.h
index f99bc19..e6ba911 100644 (file)
--- a/include/xbt/mallocator.h
+++ b/include/xbt/mallocator.h
@@ -51,4 +51,4 @@ XBT_PUBLIC void xbt_mallocator_initialization_is_done(int protect);
 /** @} */
 
 SG_END_DECL
 /** @} */
 
 SG_END_DECL

-#endif                          /* _XBT_MALLOCATOR_H */
+#endif /* XBT_MALLOCATOR_H */

diff --git a/src/bindings/java/JavaContext.hpp b/src/bindings/java/JavaContext.hpp
index 432ccc5..5a7caf6 100644 (file)
--- a/src/bindings/java/JavaContext.hpp
+++ b/src/bindings/java/JavaContext.hpp
@@ -51,4 +51,4 @@ XBT_PRIVATE void java_main_jprocess(jobject process);
 
 }}} // namespace simgrid::kernel::context
 
 
 }}} // namespace simgrid::kernel::context
 

-#endif                          /* !_XBT_CONTEXT_JAVA_H */
+#endif /* SIMGRID_JAVA_JAVA_CONTEXT_HPP */

diff --git a/src/kernel/activity/ActivityImpl.hpp b/src/kernel/activity/ActivityImpl.hpp
index a6b84a6..c1c8de5 100644 (file)
--- 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. */
 
 /* 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_ACTIVITY_HPP
-#define SIMGRID_KERNEL_ACTIVITY_ACTIVITY_HPP
+#ifndef SIMGRID_KERNEL_ACTIVITY_ACTIVITYIMPL_HPP
+#define SIMGRID_KERNEL_ACTIVITY_ACTIVITYIMPL_HPP

 
 #include <string>
 #include <list>
 
 #include <string>
 #include <list>

diff --git a/src/kernel/activity/SemaphoreImpl.hpp b/src/kernel/activity/SemaphoreImpl.hpp
index 7a61019..361c7cf 100644 (file)
--- 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. */
 
 /* 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_SEMAPHORE_HPP
-#define SIMGRID_KERNEL_ACTIVITY_SEMAPHORE_HPP
+#ifndef SIMGRID_KERNEL_ACTIVITY_SEMAPHOREIMPL_HPP
+#define SIMGRID_KERNEL_ACTIVITY_SEMAPHOREIMPL_HPP

 
 #include <atomic>
 #include <boost/intrusive/list.hpp>
 
 #include <atomic>
 #include <boost/intrusive/list.hpp>


@@ -51,4 +51,4 @@ public:
 } // namespace kernel
 } // namespace simgrid
 
 } // namespace kernel
 } // namespace simgrid
 

-#endif /* SIMGRID_KERNEL_ACTIVITY_SEMAPHOREIMPL_HPP_ */
+#endif /* SIMGRID_KERNEL_ACTIVITY_SEMAPHOREIMPL_HPP */

diff --git a/src/surf/HostImpl.hpp b/src/surf/HostImpl.hpp
index 91cf35c..bb01090 100644 (file)
--- a/src/surf/HostImpl.hpp
+++ b/src/surf/HostImpl.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. */
 
 /* 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 SURF_HOST_INTERFACE_HPP_
-#define SURF_HOST_INTERFACE_HPP_
+#ifndef SURF_HOST_INTERFACE_HPP
+#define SURF_HOST_INTERFACE_HPP

 
 #include "src/kernel/actor/ActorImpl.hpp"
 #include "src/kernel/resource/DiskImpl.hpp"
 
 #include "src/kernel/actor/ActorImpl.hpp"
 #include "src/kernel/resource/DiskImpl.hpp"


@@ -87,4 +87,4 @@ public:
 
 XBT_PUBLIC_DATA simgrid::surf::HostModel* surf_host_model;
 
 
 XBT_PUBLIC_DATA simgrid::surf::HostModel* surf_host_model;
 

-#endif /* SURF_Host_INTERFACE_HPP_ */
+#endif /* SURF_HOST_INTERFACE_HPP */

diff --git a/teshsuite/msg/app-bittorrent/tracker.h b/teshsuite/msg/app-bittorrent/tracker.h
index aaea20f..8975121 100644 (file)
--- a/teshsuite/msg/app-bittorrent/tracker.h
+++ b/teshsuite/msg/app-bittorrent/tracker.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. */
 
 /* 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 BITTORRENT_TRACKER_H_
-#define BITTORRENT_TRACKER_H_
+#ifndef BITTORRENT_TRACKER_H
+#define BITTORRENT_TRACKER_H

 #include "bittorrent.h"
 #include <xbt/dynar.h>
 /**
 #include "bittorrent.h"
 #include <xbt/dynar.h>
 /**