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
Remove old #define/#undef.
[simgrid.git]
/
src
/
simdag
/
sd_daxloader.cpp
diff --git
a/src/simdag/sd_daxloader.cpp
b/src/simdag/sd_daxloader.cpp
index
110716b
..
409caee
100644
(file)
--- a/
src/simdag/sd_daxloader.cpp
+++ b/
src/simdag/sd_daxloader.cpp
@@
-9,17
+9,13
@@
#include "xbt/file.h" /* xbt_basename() */
#include "xbt/log.h"
#include "xbt/misc.h"
#include "xbt/file.h" /* xbt_basename() */
#include "xbt/log.h"
#include "xbt/misc.h"
-#include "xbt/str.h"
#include <map>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_daxparse, sd, "Parsing DAX files");
extern "C" {
#include <map>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_daxparse, sd, "Parsing DAX files");
extern "C" {
- #undef CLEANUP
- #include "dax_dtd.h"
- #define register /* g++ don't like register, so don't say it */
- #include "dax_dtd.c"
- #undef register
+#include "dax_dtd.h"
+#include "dax_dtd.c"
}
/* Ensure that transfer tasks have unique names even though a file is used several times */
}
/* Ensure that transfer tasks have unique names even though a file is used several times */