Commit e039ebba authored by Peter Van Gemmeren's avatar Peter Van Gemmeren Committed by Graeme Stewart
Browse files

Remove pair<string, int> dictionary to avoid duplicate in ROOT6....

Remove pair<string, int> dictionary to avoid duplicate in ROOT6. (PersistentDataModelTPCnv-00-02-05)

	* PersistentDataModelTPCnv/selection.xml: Remove pair<string, int> to avoid duplicate in ROOT6.
	* tag PersistentDataModelTPCnv-00-02-05

2014-10-17  scott snyder  <snyder@bnl.gov>
	* Tagging PersistentDataModelTPCnv-00-02-04.
	* Fix coverity warnings.
parent 20f8c4c0
...@@ -27,6 +27,5 @@ ...@@ -27,6 +27,5 @@
<class name="Guid" /> <class name="Guid" />
<class name="std::vector<std::pair<Guid, std::pair<std::string, unsigned int> > >" /> <class name="std::vector<std::pair<Guid, std::pair<std::string, unsigned int> > >" />
<class name="std::pair<Guid, std::pair<std::string, unsigned int> >" /> <class name="std::pair<Guid, std::pair<std::string, unsigned int> >" />
<class name="std::pair<std::string, unsigned int>" />
<class name="DataHeaderCnv_p6"/> <class name="DataHeaderCnv_p6"/>
</lcgdict> </lcgdict>
...@@ -9,7 +9,12 @@ ...@@ -9,7 +9,12 @@
#include <uuid/uuid.h> #include <uuid/uuid.h>
#include <sstream> #include <sstream>
DataHeaderElement_p6::DataHeaderElement_p6() : m_token(), m_oid1(0ULL), m_oid2(0ULL) {} DataHeaderElement_p6::DataHeaderElement_p6() :
m_token(),
m_oid1(0ULL),
m_oid2(0ULL),
m_dbIdx(0),
m_objIdx(0) {}
DataHeaderElement_p6::DataHeaderElement_p6(const DataHeaderElement_p6& rhs) : m_token(rhs.m_token), DataHeaderElement_p6::DataHeaderElement_p6(const DataHeaderElement_p6& rhs) : m_token(rhs.m_token),
m_oid1(rhs.m_oid1), m_oid1(rhs.m_oid1),
m_oid2(rhs.m_oid2), m_oid2(rhs.m_oid2),
...@@ -163,10 +168,12 @@ void DataHeaderForm_p6::resize(unsigned int size) { ...@@ -163,10 +168,12 @@ void DataHeaderForm_p6::resize(unsigned int size) {
DataHeader_p6::DataHeader_p6() : m_dataHeader(), m_provenanceSize(0U), m_dhForm(), m_dhFormToken(), m_dhFormMdx() {} DataHeader_p6::DataHeader_p6() : m_dataHeader(), m_provenanceSize(0U), m_dhForm(), m_dhFormToken(), m_dhFormMdx() {}
DataHeader_p6::DataHeader_p6(const DataHeader_p6& rhs) : m_dataHeader(rhs.m_dataHeader), DataHeader_p6::DataHeader_p6(const DataHeader_p6& rhs) :
m_dhForm(rhs.m_dhForm), m_dataHeader(rhs.m_dataHeader),
m_dhFormToken(rhs.m_dhFormToken), m_provenanceSize(rhs.m_provenanceSize),
m_dhFormMdx(rhs.m_dhFormMdx) {} m_dhForm(rhs.m_dhForm),
m_dhFormToken(rhs.m_dhFormToken),
m_dhFormMdx(rhs.m_dhFormMdx) {}
DataHeader_p6::~DataHeader_p6() {} DataHeader_p6::~DataHeader_p6() {}
DataHeader_p6& DataHeader_p6::operator=(const DataHeader_p6& rhs) { DataHeader_p6& DataHeader_p6::operator=(const DataHeader_p6& rhs) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment