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 unnecessary calls to c_str().
[simgrid.git]
/
src
/
surf
/
xml
/
surfxml_sax_cb.cpp
diff --git
a/src/surf/xml/surfxml_sax_cb.cpp
b/src/surf/xml/surfxml_sax_cb.cpp
index
333c2e7
..
26046c6
100644
(file)
--- a/
src/surf/xml/surfxml_sax_cb.cpp
+++ b/
src/surf/xml/surfxml_sax_cb.cpp
@@
-53,7
+53,7
@@
void surf_parse_error(const std::string& msg)
void surf_parse_assert_netpoint(const std::string& hostname, const std::string& pre, const std::string& post)
{
void surf_parse_assert_netpoint(const std::string& hostname, const std::string& pre, const std::string& post)
{
- if (s
g_netpoint_by_name_or_null(hostname.c_str()
) != nullptr) // found
+ if (s
imgrid::s4u::Engine::get_instance()->netpoint_by_name_or_null(hostname
) != nullptr) // found
return;
std::string msg = pre + hostname + post + " Existing netpoints: \n";
return;
std::string msg = pre + hostname + post + " Existing netpoints: \n";
@@
-88,7
+88,6
@@
double surf_parse_get_double(const std::string& s)
return std::stod(s);
} catch (std::invalid_argument& ia) {
surf_parse_error(s + " is not a double");
return std::stod(s);
} catch (std::invalid_argument& ia) {
surf_parse_error(s + " is not a double");
- return -1;
}
}
}
}
@@
-98,7
+97,6
@@
int surf_parse_get_int(const std::string& s)
return std::stoi(s);
} catch (std::invalid_argument& ia) {
surf_parse_error(s + " is not a double");
return std::stoi(s);
} catch (std::invalid_argument& ia) {
surf_parse_error(s + " is not a double");
- return -1;
}
}
}
}
@@
-127,7
+125,6
@@
std::vector<int>* explodesRadical(const std::string& radicals)
break;
default:
surf_parse_error(std::string("Malformed radical: ") + group);
break;
default:
surf_parse_error(std::string("Malformed radical: ") + group);
- break;
}
for (int i = start; i <= end; i++)
exploded->push_back(i);
}
for (int i = start; i <= end; i++)
exploded->push_back(i);
@@
-499,7
+496,6
@@
void ETag_surfxml_cluster(){
break;
default:
surf_parse_error(std::string("Invalid cluster topology for cluster ") + cluster.id);
break;
default:
surf_parse_error(std::string("Invalid cluster topology for cluster ") + cluster.id);
- break;
}
cluster.topo_parameters = A_surfxml_cluster_topo___parameters;
cluster.router_id = A_surfxml_cluster_router___id;
}
cluster.topo_parameters = A_surfxml_cluster_topo___parameters;
cluster.router_id = A_surfxml_cluster_router___id;
@@
-520,7
+516,6
@@
void ETag_surfxml_cluster(){
break;
default:
surf_parse_error(std::string("Invalid cluster sharing policy for cluster ") + cluster.id);
break;
default:
surf_parse_error(std::string("Invalid cluster sharing policy for cluster ") + cluster.id);
- break;
}
switch (AX_surfxml_cluster_bb___sharing___policy) {
case A_surfxml_cluster_bb___sharing___policy_FATPIPE:
}
switch (AX_surfxml_cluster_bb___sharing___policy) {
case A_surfxml_cluster_bb___sharing___policy_FATPIPE:
@@
-531,7
+526,6
@@
void ETag_surfxml_cluster(){
break;
default:
surf_parse_error(std::string("Invalid bb sharing policy in cluster ") + cluster.id);
break;
default:
surf_parse_error(std::string("Invalid bb sharing policy in cluster ") + cluster.id);
- break;
}
sg_platf_new_cluster(&cluster);
}
sg_platf_new_cluster(&cluster);
@@
-621,7
+615,6
@@
void ETag_surfxml_link(){
break;
default:
surf_parse_error(std::string("Invalid sharing policy in link ") + link.id);
break;
default:
surf_parse_error(std::string("Invalid sharing policy in link ") + link.id);
- break;
}
sg_platf_new_link(&link);
}
sg_platf_new_link(&link);
@@
-643,7
+636,6
@@
void STag_surfxml_link___ctn()
break;
default:
surf_parse_error(std::string("Invalid direction for link ") + A_surfxml_link___ctn_id);
break;
default:
surf_parse_error(std::string("Invalid direction for link ") + A_surfxml_link___ctn_id);
- break;
}
const char* dirname = "";
}
const char* dirname = "";
@@
-836,7
+828,6
@@
void STag_surfxml_trace___connect()
break;
default:
surf_parse_error("Invalid trace kind");
break;
default:
surf_parse_error("Invalid trace kind");
- break;
}
sg_platf_trace_connect(&trace_connect);
}
}
sg_platf_trace_connect(&trace_connect);
}
@@
-950,7
+941,6
@@
void ETag_surfxml_actor()
break;
default:
surf_parse_error("Invalid on failure behavior");
break;
default:
surf_parse_error("Invalid on failure behavior");
- break;
}
sg_platf_new_actor(&actor);
}
sg_platf_new_actor(&actor);