Skip to content
Snippets Groups Projects
Commit 2b3d8e83 authored by scott snyder's avatar scott snyder Committed by scott snyder
Browse files

RootCollection: Update for ICollectionMetadata::const_iterator change.

ICollectionMetadata::const_iterator now takes a unique_ptr.
parent 4a1cb8d5
No related branches found
No related tags found
6 merge requests!58791DataQualityConfigurations: Modify L1Calo config for web display,!46784MuonCondInterface: Enable thread-safety checking.,!46776Updated LArMonitoring config file for WD to match new files produced using MT,!45405updated ART test cron job,!42417Draft: DIRE and VINCIA Base Fragments for Pythia 8.3,!37195CollectionBase, etc: Enable thread-safety checking.
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "RootCollectionMetadata.h"
......@@ -232,7 +232,7 @@ namespace pool {
if( !m_hasKeys )
readKeys();
return ICollectionMetadata::const_iterator(
new RootCollectionMetadataIterator( m_keyMap.begin(), this ) );
std::make_unique<RootCollectionMetadataIterator>( m_keyMap.begin(), this ) );
}
......@@ -243,7 +243,7 @@ namespace pool {
if( !m_hasKeys ) // check also here, in case End is evaluated before Begin
readKeys();
return ICollectionMetadata::const_iterator(
new RootCollectionMetadataIterator( m_keyMap.end(), this ) );
std::make_unique<RootCollectionMetadataIterator>( m_keyMap.end(), this ) );
}
} // end namespace
......
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef RootCollectionMetadata_h
......@@ -55,6 +55,7 @@ namespace pool {
class RootCollectionMetadataIterator
: public ICollectionMetadata::ICollectionMetadataIterator
{
public:
friend class RootCollectionMetadata;
RootCollectionMetadataIterator( const MetadataKeyMap_t::const_iterator& iter,
......
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