Skip to content
Snippets Groups Projects
Commit 3bd11440 authored by Andrea Zoli's avatar Andrea Zoli
Browse files

Fix warnings.

parent a00ecf3e
No related branches found
No related tags found
No related merge requests found
...@@ -103,7 +103,7 @@ public: ...@@ -103,7 +103,7 @@ public:
SDFBlock(); SDFBlock();
virtual ~SDFBlock(); virtual ~SDFBlock();
void loadFields(pugi::xml_node node, const pugi::xml_document& doc, virtual void loadFieldsSDFB(pugi::xml_node node, const pugi::xml_document& doc,
std::map<pugi::xml_node, int>& physicalIndex); std::map<pugi::xml_node, int>& physicalIndex);
virtual bool loadFields(InputText& fp) throw(PacketException*); virtual bool loadFields(InputText& fp) throw(PacketException*);
......
...@@ -34,7 +34,7 @@ public: ...@@ -34,7 +34,7 @@ public:
virtual ~SourceDataField(); virtual ~SourceDataField();
virtual void loadFields(pugi::xml_node node, const pugi::xml_document& doc, std::map<pugi::xml_node, int>& physicalIndex); virtual void loadFieldsSDF(pugi::xml_node node, const pugi::xml_document& doc, std::map<pugi::xml_node, int>& physicalIndex);
virtual bool loadFields(InputText& fp) throw(PacketException*); virtual bool loadFields(InputText& fp) throw(PacketException*);
......
...@@ -131,7 +131,7 @@ void Packet::createPacketType(pugi::xml_document& doc, pugi::xml_node hNode, int ...@@ -131,7 +131,7 @@ void Packet::createPacketType(pugi::xml_document& doc, pugi::xml_node hNode, int
if(!sdfNode) throw new PacketExceptionFileFormat("<sourcedatafield> not found."); if(!sdfNode) throw new PacketExceptionFileFormat("<sourcedatafield> not found.");
PacketLib::SourceDataField* sdf = new PacketLib::SourceDataField(dfh); PacketLib::SourceDataField* sdf = new PacketLib::SourceDataField(dfh);
dataField->setPacketSourceDataField(sdf); dataField->setPacketSourceDataField(sdf);
sdf->loadFields(sdfNode, doc, physicalIndex); sdf->loadFieldsSDF(sdfNode, doc, physicalIndex);
dimPacketSourceDataFieldFixed = sdf->sizeFixedPart(); dimPacketSourceDataFieldFixed = sdf->sizeFixedPart();
dimPacketStartingFixedPart = dimPacketHeader + dimPacketDataFieldHeader + dimPacketSourceDataFieldFixed; dimPacketStartingFixedPart = dimPacketHeader + dimPacketDataFieldHeader + dimPacketSourceDataFieldFixed;
......
...@@ -364,7 +364,7 @@ SDFBlock::~SDFBlock() ...@@ -364,7 +364,7 @@ SDFBlock::~SDFBlock()
delete[] block; delete[] block;
} }
void SDFBlock::loadFields(pugi::xml_node rbNode, const pugi::xml_document& doc, void SDFBlock::loadFieldsSDFB(pugi::xml_node rbNode, const pugi::xml_document& doc,
std::map<pugi::xml_node, int>& physicalIndex) std::map<pugi::xml_node, int>& physicalIndex)
{ {
popName = (char*) rbNode.attribute("name").value(); popName = (char*) rbNode.attribute("name").value();
...@@ -424,7 +424,7 @@ void SDFBlock::loadFields(pugi::xml_node rbNode, const pugi::xml_document& doc, ...@@ -424,7 +424,7 @@ void SDFBlock::loadFields(pugi::xml_node rbNode, const pugi::xml_document& doc,
block[nblock].setRBlockType(indexRBlock); block[nblock].setRBlockType(indexRBlock);
block[nblock].setID(id); block[nblock].setID(id);
pugi::xml_node childNode = rbNode.child(type->rblockFilename[indexRBlock]); pugi::xml_node childNode = rbNode.child(type->rblockFilename[indexRBlock]);
block[nblock].loadFields(childNode, doc, physicalIndex); block[nblock].loadFieldsSDFB(childNode, doc, physicalIndex);
id++; id++;
} }
} }
......
...@@ -51,7 +51,7 @@ SourceDataField::~SourceDataField() ...@@ -51,7 +51,7 @@ SourceDataField::~SourceDataField()
} }
void SourceDataField::loadFields(pugi::xml_node node, const pugi::xml_document& doc, std::map<pugi::xml_node, int>& physicalIndex) void SourceDataField::loadFieldsSDF(pugi::xml_node node, const pugi::xml_document& doc, std::map<pugi::xml_node, int>& physicalIndex)
{ {
numberOfRBlocks = 1; numberOfRBlocks = 1;
rblockFilename = new char*[numberOfRBlocks]; rblockFilename = new char*[numberOfRBlocks];
...@@ -66,7 +66,7 @@ void SourceDataField::loadFields(pugi::xml_node node, const pugi::xml_document& ...@@ -66,7 +66,7 @@ void SourceDataField::loadFields(pugi::xml_node node, const pugi::xml_document&
block[0].setPreviousPop(previous); block[0].setPreviousPop(previous);
block[0].setRBlockType(0); block[0].setRBlockType(0);
block[0].setID(0); block[0].setID(0);
block[0].loadFields(node, doc, physicalIndex); block[0].loadFieldsSDFB(node, doc, physicalIndex);
} }
bool SourceDataField::loadFields(InputText& fp) throw(PacketException*) bool SourceDataField::loadFields(InputText& fp) throw(PacketException*)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment