Commit 3bd11440 authored by Andrea Zoli's avatar Andrea Zoli
Browse files

Fix warnings.

parent a00ecf3e

include/SDFBlock.h

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ public: 
    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);



    virtual bool loadFields(InputText& fp) throw(PacketException*);

include/SourceDataField.h

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ public: 


    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*);

src/Packet.cpp

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ void Packet::createPacketType(pugi::xml_document& doc, pugi::xml_node hNode, int 
	if(!sdfNode) throw new PacketExceptionFileFormat("<sourcedatafield> not found.");

	PacketLib::SourceDataField* sdf = new PacketLib::SourceDataField(dfh);

	dataField->setPacketSourceDataField(sdf);

	sdf->loadFields(sdfNode, doc, physicalIndex);

	sdf->loadFieldsSDF(sdfNode, doc, physicalIndex);

	dimPacketSourceDataFieldFixed = sdf->sizeFixedPart();

	dimPacketStartingFixedPart = dimPacketHeader + dimPacketDataFieldHeader + dimPacketSourceDataFieldFixed;

src/SDFBlock.cpp

+2 −2
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ SDFBlock::~SDFBlock() 
    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)

{

	popName = (char*) rbNode.attribute("name").value();
@@ -424,7 +424,7 @@ void SDFBlock::loadFields(pugi::xml_node rbNode, const pugi::xml_document& doc, 
			block[nblock].setRBlockType(indexRBlock);

			block[nblock].setID(id);

			pugi::xml_node childNode = rbNode.child(type->rblockFilename[indexRBlock]);

			block[nblock].loadFields(childNode, doc, physicalIndex);

			block[nblock].loadFieldsSDFB(childNode, doc, physicalIndex);

			id++;

		}

	}

src/SourceDataField.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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;

        rblockFilename = new char*[numberOfRBlocks];
@@ -66,7 +66,7 @@ void SourceDataField::loadFields(pugi::xml_node node, const pugi::xml_document& 
        block[0].setPreviousPop(previous);

        block[0].setRBlockType(0);

        block[0].setID(0);

        block[0].loadFields(node, doc, physicalIndex);

        block[0].loadFieldsSDFB(node, doc, physicalIndex);

}



bool SourceDataField::loadFields(InputText& fp) throw(PacketException*)