/* module handling */
-/* Copyright (c) 2006-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-2018. The SimGrid Team. 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. */
#define XBT_LOG_LOCALLY_DEFINE_XBT_CHANNEL /* MSVC don't want it to be declared extern in headers and local here */
-#include "simgrid_config.h"
-#include "xbt/config.h"
+#include "simgrid/config.h"
+#include "simgrid/sg_config.hpp"
+#include "src/internal_config.h"
+#include "src/xbt_modinter.h" /* prototype of other module's init/exit in XBT */
+#include "xbt/config.hpp"
#include "xbt/dynar.h"
#include "xbt/log.h"
#include "xbt/log.hpp"
#include "xbt/misc.h"
+#include "xbt/module.h" /* this module */
#include "xbt/sysdep.h"
-#include <cmath>
-
-#include "xbt/module.h" /* this module */
-
-#include "src/xbt_modinter.h" /* prototype of other module's init/exit in XBT */
-#include "simgrid/sg_config.h"
-
-#include "src/internal_config.h"
+#include <cmath>
#include <cstdio>
#ifdef _WIN32
# include <csignal> /* To silence MSVC on abort() */
xbt_dynar_t xbt_cmdline = NULL; /* all we got in argv */
int xbt_initialized = 0;
-int _sg_do_clean_atexit = 1;
+bool _sg_do_clean_atexit = true;
int xbt_pagesize;
int xbt_pagebits = 0;
/* Declare xbt_preinit and xbt_postexit as constructor/destructor of the library.
* This is crude and rather compiler-specific, unfortunately.
*/
-static void xbt_preinit() _XBT_GNUC_CONSTRUCTOR(200);
+static void xbt_preinit() XBT_ATTRIB_CONSTRUCTOR(200);
static void xbt_postexit();
#ifdef _WIN32
/** @brief Initialize the xbt mechanisms. */
void xbt_init(int *argc, char **argv)
{
- simgrid::xbt::installExceptionHandler();
+ simgrid::xbt::install_exception_handler();
xbt_initialized++;
if (xbt_initialized > 1) {