X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cf108868b4eeed4d0d9d343bc68557d7814e18c0..d919680dd6d792fccc5cab4ace6fbe93974919cd:/src/simix/simcalls.py

diff --git a/src/simix/simcalls.py b/src/simix/simcalls.py
index 73c78ce37d..18c6dabc42 100755
--- a/src/simix/simcalls.py
+++ b/src/simix/simcalls.py
@@ -168,7 +168,7 @@ class Simcall(object):
                              for i, arg in enumerate(self.args)))
         res.append('    if (self != simix_global->maestro_process) {')
         res.append(
-            '      XBT_DEBUG("Yield process \'%s\' on simcall %s (%d)", self->name,')
+            '      XBT_DEBUG("Yield process \'%s\' on simcall %s (%d)", self->name.c_str(),')
         res.append(
             '                SIMIX_simcall_name(self->simcall.call), (int)self->simcall.call);')
         res.append('      SIMIX_process_yield(self);')
@@ -257,7 +257,7 @@ def handle(fd, func, simcalls, guarded_simcalls):
         '\n'.join(filter(nonempty, (func(simcall) for simcall in simcalls))))
 
     for guard, list in guarded_simcalls.items():
-        fd.write('\n#ifdef %s\n' % (guard))
+        fd.write('\n#if %s\n' % (guard))
         fd.write('\n'.join(func(simcall) for simcall in list))
         fd.write('\n#endif\n')
 
@@ -308,8 +308,8 @@ if __name__ == '__main__':
 
     fd.write('#include <xbt/base.h>\n')
     fd.write('#include "smx_private.h"\n')
-    fd.write('#ifdef HAVE_MC\n')
-    fd.write('#include "src/mc/mc_forward.h"\n')
+    fd.write('#if HAVE_MC\n')
+    fd.write('#include "src/mc/mc_forward.hpp"\n')
     fd.write('#endif\n')
     fd.write('\n')
     fd.write('XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_popping);\n\n')
@@ -323,7 +323,7 @@ if __name__ == '__main__':
 
     fd.write('};\n\n')
 
-    fd.write('/**\n')
+    fd.write('/** @private\n')
     fd.write(
         ' * @brief (in kernel mode) unpack the simcall and activate the handler\n')
     fd.write(' * \n')
@@ -362,8 +362,10 @@ if __name__ == '__main__':
     #
     fd = header('popping_bodies.cpp')
     fd.write('#include "smx_private.h"\n')
-    fd.write('#include "src/mc/mc_forward.h"\n')
+    fd.write('#include "src/mc/mc_forward.hpp"\n')
     fd.write('#include "xbt/ex.h"\n')
     fd.write('#include <simgrid/simix.hpp>\n')
+    fd.write("/** @cond */ // Please Doxygen, don't look at this\n")
     handle(fd, Simcall.body, simcalls, simcalls_dict)
+    fd.write("/** @endcond */\n");
     fd.close()