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
added circle placement for ns3 wifi nodes
[simgrid.git]
/
include
/
xbt
/
virtu.h
diff --git
a/include/xbt/virtu.h
b/include/xbt/virtu.h
index bb4bad248f106c92d275d7b7312937b558399867..21b3d8939cbcfd4f91c960e2fdc26259c01a4333 100644
(file)
--- a/
include/xbt/virtu.h
+++ b/
include/xbt/virtu.h
@@
-1,6
+1,6
@@
/* virtu - virtualization layer for the logging to know about the actors */
/* virtu - virtualization layer for the logging to know about the actors */
-/* Copyright (c) 2007-20
17
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-20
20
. 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. */
@@
-8,22
+8,30
@@
#ifndef XBT_VIRTU_H
#define XBT_VIRTU_H
#ifndef XBT_VIRTU_H
#define XBT_VIRTU_H
-#include "xbt/misc.h"
-#include "xbt/base.h"
-#include "xbt/function_types.h"
-#include "xbt/dynar.h"
+#include <xbt/base.h>
-SG_BEGIN_DECL()
+#ifdef __cplusplus
+#include <string>
+#include <vector>
-XBT_PUBLIC(const char*) xbt_procname(void);
-
-XBT_PUBLIC(int) xbt_getpid(void);
+namespace simgrid {
+namespace xbt {
/* Get the name of the UNIX process englobing the world */
/* Get the name of the UNIX process englobing the world */
-XBT_PUBLIC_DATA(char*) xbt_binary_name;
-
+XBT_PUBLIC_DATA std::string binary_name;
/** Contains all the parameters we got from the command line (including argv[0]) */
/** Contains all the parameters we got from the command line (including argv[0]) */
-XBT_PUBLIC_DATA(xbt_dynar_t) xbt_cmdline;
+XBT_PUBLIC_DATA std::vector<std::string> cmdline;
+
+} // namespace xbt
+} // namespace simgrid
+#endif
+
+SG_BEGIN_DECL
+
+XBT_PUBLIC const char* xbt_procname(void);
+
+XBT_PUBLIC int xbt_getpid(void);
+
+SG_END_DECL
-SG_END_DECL()
#endif /* XBT_VIRTU_H */
#endif /* XBT_VIRTU_H */