X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/45c3f1cfee86fb48c96d53f8267f99b6db6e3d7a..b4d7a13984960eddb339b80aef389c1469ff6596:/include/xbt/cunit.h

diff --git a/include/xbt/cunit.h b/include/xbt/cunit.h
index 37df800cab..f462e067bc 100644
--- a/include/xbt/cunit.h
+++ b/include/xbt/cunit.h
@@ -76,9 +76,9 @@ XBT_PUBLIC(void) xbt_test_exit(void);
  * Note that if you want to test a full binary (such as an example),
  * you want to use our integration testing mechanism, not our unit
  * testing one. Please refer to Section \ref
- * inside_cmake_addtest_integration
+ * inside_tests_add_integration
  * 
- * Some more information on our unit testing is available in Section @ref inside_cmake_addtest_unit.  
+ * Some more information on our unit testing is available in Section @ref inside_tests_add_units.
  * 
  * All code intended to be executed as a unit test will be extracted
  * by a script (tools/sg_unit_extract.pl), and must thus be protected
@@ -117,19 +117,24 @@ XBT_PUBLIC(void) xbt_test_exit(void);
  * @param func a valid function name that will be used to contain all code of this unit
  * @param title human informative description of your test (displayed in testall)
  */
+#ifdef __cplusplus
+#define XBT_TEST_UNIT(name,func,title)    \
+    extern "C" void func(void);  /*prototype*/ \
+    void func(void)
+#else
 #define XBT_TEST_UNIT(name,func,title)    \
     void func(void);  /*prototype*/       \
     void func(void)
-
+#endif
 
 /* test operations */
 XBT_PUBLIC(void) _xbt_test_add(const char *file, int line, const char *fmt,
-                               ...) _XBT_GNUC_PRINTF(3, 4);
+                               ...) XBT_ATTRIB_PRINTF(3, 4);
 XBT_PUBLIC(void) _xbt_test_fail(const char *file, int line,
-                                const char *fmt, ...) _XBT_GNUC_PRINTF(3,
+                                const char *fmt, ...) XBT_ATTRIB_PRINTF(3,
                                                                        4);
 XBT_PUBLIC(void) _xbt_test_log(const char *file, int line, const char *fmt,
-                               ...) _XBT_GNUC_PRINTF(3, 4);
+                               ...) XBT_ATTRIB_PRINTF(3, 4);
 /** @brief Declare that a new test begins (printf-like parameters, describing the test) 
  *  @hideinitializer */
 #define xbt_test_add(...)       _xbt_test_add(__FILE__, __LINE__, __VA_ARGS__)