Skip to content
Snippets Groups Projects
Commit 66ae4aa9 authored by Tammo Jan Dijkema's avatar Tammo Jan Dijkema
Browse files

Task #11410: fix compiler warnings about casa::String

parent 68835aff
No related branches found
No related tags found
No related merge requests found
......@@ -514,7 +514,7 @@ namespace LOFAR {
}
for (uint ant = 0; ant < numAnts; ++ant) {
parmIt = parmMap.find(parmExpr + ":" + info().antennaNames()[ant]
parmIt = parmMap.find(parmExpr + ":" + string(info().antennaNames()[ant])
+ name_postfix);
if (parmIt != parmMap.end()) {
......@@ -525,14 +525,13 @@ namespace LOFAR {
double defValue;
if (itsParmDB->getDefValues(parmExpr + ":" +
info().antennaNames()[ant] + name_postfix).size()==1) { // Default for antenna
itsParmDB->getDefValues(itsParmExprs[parmExprNum] + ":" +
info().antennaNames()[ant]).get(0,defValues);
string(info().antennaNames()[ant]) + name_postfix).size()==1) { // Default for antenna
itsParmDB->getDefValues(string(itsParmExprs[parmExprNum]) + ":" +
string(info().antennaNames()[ant]) + name_postfix).get(0,defValues);
ASSERT(defValues.size()==1);
defValue=defValues.data()[0];
}
else if (itsParmDB->getDefValues(parmExpr).size()
== 1) { //Default value
else if (itsParmDB->getDefValues(parmExpr).size() == 1) { //Default value
itsParmDB->getDefValues(parmExpr).get(0,defValues);
ASSERT(defValues.size()==1);
defValue=defValues.data()[0];
......@@ -541,7 +540,7 @@ namespace LOFAR {
}
else {
THROW (Exception, "No parameter value found for "+
parmExpr + ":" + info().antennaNames()[ant] + name_postfix);
parmExpr + ":" + string(info().antennaNames()[ant]) + name_postfix);
}
parmvalues[parmExprNum][ant].resize(tfDomainSize);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment