sg_size_t size;
} s_sg_platf_storage_type_cbarg_t, *sg_platf_storage_type_cbarg_t;
-#define SG_PLATF_STORAGE_TYPE_INITIALIZER {NULL,NULL,NULL,NULL,NULL,NULL}
+#define SG_PLATF_STORAGE_TYPE_INITIALIZER {NULL,NULL,NULL,NULL,NULL,NULL,0}
typedef struct {
const char* type_id;
#include "xbt/misc.h"
#include "xbt/function_types.h"
#include "xbt/dict.h"
-#include "surf/simgrid_dtd.h"
+SG_BEGIN_DECL()
+#include "surf/simgrid_dtd.h"
#ifndef YY_TYPEDEF_YY_SIZE_T
#define YY_TYPEDEF_YY_SIZE_T
typedef size_t yy_size_t;
#endif
-SG_BEGIN_DECL()
-
XBT_PUBLIC(void) surf_parse_open(const char *file);
XBT_PUBLIC(void) surf_parse_close(void);
XBT_PUBLIC(void) surf_parse_init_callbacks(void);
*/
#define YY_LESS_LINENO(n) \
do { \
- int yyl;\
+ unsigned int yyl;\
for ( yyl = n; yyl < surf_parse_leng; ++yyl )\
if ( surf_parse_text[yyl] == '\n' )\
--surf_parse_lineno;\
}
else {
xbt_dynar_t pstate_list = xbt_str_split(buf, ",");
- int i;
+ unsigned int i;
for (i = 0; i < xbt_dynar_length(pstate_list); i++) {
double speed;
char* speed_str;
void ETag_surfxml_AS(void){
if(as_prop_nb){
char *name = as_name_tab[as_prop_nb-1];
- xbt_dict_t dict = as_dict_tab[as_prop_nb-1];
+ xbt_dict_t dict = (xbt_dict_t) as_dict_tab[as_prop_nb-1];
as_prop_nb--;
XBT_DEBUG("POP prop %p for AS '%s'",dict,name);
xbt_lib_set(as_router_lib,
void STag_surfxml_argument(void){
argc++;
- argv = xbt_realloc(argv, (argc) * sizeof(char *));
+ argv = (char**)xbt_realloc(argv, (argc) * sizeof(char **));
argv[(argc) - 1] = xbt_strdup(A_surfxml_argument_value);
}
xbt_dict_t get_as_router_properties(const char* name)
{
- return xbt_lib_get_or_null(as_router_lib, name, ROUTING_PROP_ASR_LEVEL);
+ return (xbt_dict_t)xbt_lib_get_or_null(as_router_lib, name, ROUTING_PROP_ASR_LEVEL);
}
src/surf/surf_routing_none.hpp
src/surf/surf_routing_private.hpp
src/surf/surf_routing_vivaldi.hpp
- src/surf/surfxml_parse.c
+ src/surf/surfxml_parse.cpp
src/surf/vm_hl13.hpp
src/surf/PropertyHolder.hpp
src/surf/virtual_machine.hpp
src/surf/cpu_ti.cpp
src/surf/fair_bottleneck.cpp
src/surf/instr_routing.cpp
- src/surf/instr_surf.c
+ src/surf/instr_surf.cpp
src/surf/lagrange.cpp
src/surf/maxmin.cpp
src/surf/network_cm02.cpp
src/surf/surf_routing_none.cpp
src/surf/surf_routing_vivaldi.cpp
src/surf/surfxml_private.h
- src/surf/surfxml_parse.c
+ src/surf/surfxml_parse.cpp
src/surf/surfxml_parseplatf.cpp
src/surf/trace_mgr.hpp
src/surf/trace_mgr.cpp
COMMAND ${FLEX_EXE} -o src/surf/simgrid_dtd.c -Psurf_parse_ --noline src/surf/simgrid_dtd.l
COMMAND ${SED_EXE} -i ${string9} src/surf/simgrid_dtd.c
COMMAND ${SED_EXE} -i ${string15} src/surf/simgrid_dtd.c
+ COMMAND ${SED_EXE} -i "s/int yyl;/unsigned int yyl;/" src/surf/simgrid_dtd.c
COMMAND ${CMAKE_COMMAND} -E echo "surf/simgrid_dtd.c"
#xbt/graphxml.c: xbt/graphxml.l