Skip to content
Snippets Groups Projects
Commit e573d2c0 authored by Walter Lampl's avatar Walter Lampl
Browse files

Merge branch 'revert.EventContainers-20181219' into 'master'

EventContainers: Revert gcc9 warning change.

See merge request atlas/athena!20049
parents 95bcc216 471602d2
No related branches found
No related tags found
No related merge requests found
......@@ -106,6 +106,17 @@ public:
/// iterator constructor
const_iterator() : m_sptr(), m_current(nullptr), m_idContainer(nullptr), m_end(false) { }
/// assignment operator
const_iterator& operator = ( const const_iterator & it ) {
if(this == &it) return *this;//Safeguard against self assignment
m_hashItr = it.m_hashItr;
m_sptr = it.m_sptr;
m_current = it.m_current;
m_idContainer = it.m_idContainer;
m_end = it.m_end;
return *this;
}
/// increment operator
const_iterator& operator ++ () {
if(m_end) return *this;
......
......@@ -208,8 +208,6 @@ public:
PseudoView(int s, int r, EventContainers::IdentifiableCache<MyCollection>* inIDC, int i) : IDC(inIDC), RoIStart(s), RoIEnd(r),
threads(i), c() {}
PseudoView (const PseudoView&) = default;
PseudoView& operator= (const PseudoView&) = default;
virtual ~PseudoView() {}
};
......
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