Merge chrono.h (timing macros) and cond.h (conditional execution) into emul.h (emulat...

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@1260 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/include/gras/cond.h b/include/gras/cond.h
deleted file mode 100644 (file)
index 99ac277..0000000
--- a/include/gras/cond.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* $Id$                     */
-
-/* gras/cond.h - public interface to conditional execution                  */
-/*                (specific parts for SG or RL)                             */
- 
-/* Copyright (c) 2003, 2004 Martin Quinson. All rights reserved.            */
-
-/* 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 GRAS_COND_H
-#define GRAS_COND_H
-
-#include "xbt/misc.h" /* BEGIN_DECL */
-
-BEGIN_DECL()
-
-/** @addtogroup GRAS_cond
- *  @brief Handling code specific to the simulation or to the reality (Virtualization).
- * 
- *  Please note that those are real functions and not pre-processor defines. This is to ensure
- *  that the same object code can be linked against the SG library or the RL one without recompilation.
- * 
- *  @{
- */
-  
-/** \brief Returns true only if the program runs on real life */
-int gras_if_RL(void);
-
-/** \brief Returns true only if the program runs within the simulator */
-int gras_if_SG(void);
-
-/** @} */
-
-END_DECL()
-
-#endif /* GRAS_COND_H */
-

diff --git a/include/gras/chrono.h b/include/gras/emul.h
similarity index 63%
rename from include/gras/chrono.h
rename to include/gras/emul.h
index fd570c8..054e061 100644 (file)
--- a/include/gras/chrono.h
+++ b/include/gras/emul.h
@@ -1,21 +1,37 @@
-/*     $Id$     */
+/* $Id$                     */
 
-/* chrono.h - timer macros for GRAS                                         */
-
-/* Copyright (c) 2005 Martin Quinson, Arnaud Legrand. All rights reserved.  */
+/* gras/emul.h - public interface to emulation support                      */
+/*                (specific parts for SG or RL)                             */
+ 
+/* Copyright (c) 2003, 2004 Martin Quinson. All rights reserved.            */
 
 /* 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 GRAS_COND_H
+#define GRAS_COND_H
 
-#ifndef GRAS_CHRONO_H
-#define GRAS_CHRONO_H
-
-#include "xbt/misc.h"
-#include "gras/cond.h"
+#include "xbt/misc.h" /* BEGIN_DECL */
 
 BEGIN_DECL()
 
+/** @addtogroup GRAS_emul
+ *  @brief Handling code specific to the simulation or to the reality (Virtualization).
+ * 
+ *  Please note that those are real functions and not pre-processor defines. This is to ensure
+ *  that the same object code can be linked against the SG library or the RL one without recompilation.
+ * 
+ *  @{
+ */
+  
+/** \brief Returns true only if the program runs on real life */
+int gras_if_RL(void);
+
+/** \brief Returns true only if the program runs within the simulator */
+int gras_if_SG(void);
+
+/** @} */
+
 int gras_bench_always_begin(const char *location, int line);
 int gras_bench_always_end(void);
 int gras_bench_once_begin(const char *location, int line);
@@ -44,4 +60,5 @@ int gras_bench_once_end(void);
 
 END_DECL()
 
-#endif /* GRAS_CHRONO_H */
+#endif /* GRAS_COND_H */
+