From 3bd1144040de0f949a9ea5d2997e770dc319aa3d Mon Sep 17 00:00:00 2001
From: Andrea Zoli <zoli@iasfbo.inaf.it>
Date: Wed, 18 Feb 2015 20:44:34 +0100
Subject: [PATCH] Fix warnings.
---
include/SDFBlock.h | 2 +-
include/SourceDataField.h | 2 +-
src/Packet.cpp | 2 +-
src/SDFBlock.cpp | 4 ++--
src/SourceDataField.cpp | 4 ++--
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/include/SDFBlock.h b/include/SDFBlock.h
index ea547e3..b62ae24 100644
--- a/include/SDFBlock.h
+++ b/include/SDFBlock.h
@@ -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*);
diff --git a/include/SourceDataField.h b/include/SourceDataField.h
index 729daa2..85bf409 100644
--- a/include/SourceDataField.h
+++ b/include/SourceDataField.h
@@ -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*);
diff --git a/src/Packet.cpp b/src/Packet.cpp
index 3b4eae2..aa317f0 100644
--- a/src/Packet.cpp
+++ b/src/Packet.cpp
@@ -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;
diff --git a/src/SDFBlock.cpp b/src/SDFBlock.cpp
index 7c3c711..ccde830 100644
--- a/src/SDFBlock.cpp
+++ b/src/SDFBlock.cpp
@@ -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++;
}
}
diff --git a/src/SourceDataField.cpp b/src/SourceDataField.cpp
index aca8a8b..2b9d7c5 100644
--- a/src/SourceDataField.cpp
+++ b/src/SourceDataField.cpp
@@ -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*)
--
GitLab