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
Merge branch 'master' of https://framagit.org/simgrid/simgrid
[simgrid.git]
/
src
/
include
/
simgrid
/
sg_config.hpp
diff --git
a/src/include/simgrid/sg_config.hpp
b/src/include/simgrid/sg_config.hpp
index
a11602f
..
a9c8c10
100644
(file)
--- a/
src/include/simgrid/sg_config.hpp
+++ b/
src/include/simgrid/sg_config.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2012-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2012-201
9
. 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. */
/* 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. */
@@
-6,14
+6,11
@@
#ifndef SIMGRID_CONFIG_HPP
#define SIMGRID_CONFIG_HPP
#ifndef SIMGRID_CONFIG_HPP
#define SIMGRID_CONFIG_HPP
-#include "xbt/config.h"
#include "xbt/config.hpp"
/** Config Globals */
#include "xbt/config.hpp"
/** Config Globals */
-XBT_PUBLIC_DATA xbt_cfg_t simgrid_config;
XBT_PUBLIC_DATA int _sg_cfg_init_status;
XBT_PUBLIC_DATA int _sg_cfg_init_status;
-XBT_PUBLIC_DATA int _sg_cfg_exit_asap;
XBT_PUBLIC void sg_config_init(int* argc, char** argv);
XBT_PUBLIC void sg_config_finalize();
XBT_PUBLIC void sg_config_init(int* argc, char** argv);
XBT_PUBLIC void sg_config_finalize();