From: Martin Quinson <martin.quinson@loria.fr>
Date: Fri, 24 Jul 2015 18:23:20 +0000 (+0200)
Subject: Revert "[mc] Move MC_random() in mc_client_api.cpp"
X-Git-Tag: v3_12~437
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/00c3794fcf27d9c7733b5f0c1624a3120b35a72f?hp=08e979acad6f046c9790509eb53b70c87bdc33df

Revert "[mc] Move MC_random() in mc_client_api.cpp"

This reverts commit 52fd4a51d500956bc7103d0f778b765bcdef2948.
It breaks the non-MC builds.

Conflicts:
	src/mc/mc_client_api.cpp
---

diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp
index c0f9ab9f14..bc0e31470c 100644
--- a/src/mc/mc_base.cpp
+++ b/src/mc/mc_base.cpp
@@ -177,6 +177,12 @@ int MC_request_is_visible(smx_simcall_t req)
       ;
 }
 
+int MC_random(int min, int max)
+{
+  /*FIXME: return mc_current_state->executed_transition->random.value; */
+  return simcall_mc_random(min, max);
+}
+
 static int prng_random(int min, int max)
 {
   unsigned long output_size = ((unsigned long) max - (unsigned long) min) + 1;
diff --git a/src/mc/mc_client_api.cpp b/src/mc/mc_client_api.cpp
index bdc12a2150..69bdb4f285 100644
--- a/src/mc/mc_client_api.cpp
+++ b/src/mc/mc_client_api.cpp
@@ -27,7 +27,6 @@ extern "C" {
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_client_api, mc,
   "Public API for the model-checked application");
-
 }
 
 int MC_random(int min, int max)