A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sonar still does not like #undef. Use a local variable to hide _xbt_log_cat_init.
[simgrid.git]
/
src
/
xbt
/
xbt_main.cpp
diff --git
a/src/xbt/xbt_main.cpp
b/src/xbt/xbt_main.cpp
index
d53d973
..
f1736ce
100644
(file)
--- a/
src/xbt/xbt_main.cpp
+++ b/
src/xbt/xbt_main.cpp
@@
-7,14
+7,14
@@
#define XBT_LOG_LOCALLY_DEFINE_XBT_CHANNEL /* MSVC don't want it to be declared extern in headers and local here */
#define XBT_LOG_LOCALLY_DEFINE_XBT_CHANNEL /* MSVC don't want it to be declared extern in headers and local here */
-#include <math.h>
-#include "xbt/misc.h"
#include "simgrid_config.h"
#include "simgrid_config.h"
-#include "xbt/sysdep.h"
+#include "xbt/config.h"
+#include "xbt/dynar.h"
#include "xbt/log.h"
#include "xbt/log.hpp"
#include "xbt/log.h"
#include "xbt/log.hpp"
-#include "xbt/dynar.h"
-#include "xbt/config.h"
+#include "xbt/misc.h"
+#include "xbt/sysdep.h"
+#include <cmath>
#include "xbt/module.h" /* this module */
#include "xbt/module.h" /* this module */
@@
-23,12
+23,12
@@
#include "simgrid/sg_config.h"
#include "src/internal_config.h"
#include "simgrid/sg_config.h"
#include "src/internal_config.h"
-#include <
stdio.h
>
+#include <
cstdio
>
#ifdef _WIN32
#ifdef _WIN32
-#
include <signal.h
> /* To silence MSVC on abort() */
+#
include <csignal
> /* To silence MSVC on abort() */
#endif
#if HAVE_UNISTD_H
#endif
#if HAVE_UNISTD_H
-#
include <unistd.h>
+# include <unistd.h>
#endif
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(module, xbt, "module handling");
#endif
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(module, xbt, "module handling");
@@
-85,7
+85,7
@@
static void xbt_preinit()
#elif HAVE_SYSCONF
xbt_pagesize = sysconf(_SC_PAGESIZE);
#else
#elif HAVE_SYSCONF
xbt_pagesize = sysconf(_SC_PAGESIZE);
#else
-
#
error Cannot get page size.
+
#
error Cannot get page size.
#endif
xbt_pagebits = log2(xbt_pagesize);
#endif
xbt_pagebits = log2(xbt_pagesize);
@@
-135,7
+135,7
@@
void xbt_init(int *argc, char **argv)
xbt_cmdline = xbt_dynar_new(sizeof(char*), NULL);
for (int i = 0; i < *argc; i++)
xbt_dynar_push(xbt_cmdline,&(argv[i]));
xbt_cmdline = xbt_dynar_new(sizeof(char*), NULL);
for (int i = 0; i < *argc; i++)
xbt_dynar_push(xbt_cmdline,&(argv[i]));
-
+
xbt_log_init(argc, argv);
}
xbt_log_init(argc, argv);
}