Skip to content
Snippets Groups Projects
Commit c1468b61 authored by Adam Edward Barton's avatar Adam Edward Barton
Browse files

Merge branch 'master-auxcontainerbase-cleanup' into 'master'

xAODCore : Clean-up leftover float compression related bits from AuxContainerBase

See merge request atlas/athena!35914
parents 8f207c80 82751874
No related branches found
No related tags found
No related merge requests found
......@@ -18,7 +18,6 @@
#include "xAODCore/tools/ReadStats.h"
#include "CxxUtils/checker_macros.h"
#include "CxxUtils/FloatCompressor.h"
using namespace std;
......@@ -26,7 +25,6 @@ namespace xAOD {
AuxContainerBase::AuxContainerBase( bool allowDynamicVars )
: SG::IAuxStore(),
m_compression(),
m_auxids(), m_vecs(), m_store( 0 ), m_storeIO( 0 ),
m_ownsStore( true ),
m_locked( false ),
......@@ -54,7 +52,6 @@ namespace xAOD {
{
// Keep the source unmutable during copy
guard_t guard( parent.m_mutex );
m_compression = parent.m_compression;
m_name = parent.m_name;
// Unfortunately the dynamic variables can not be copied this easily...
......@@ -74,7 +71,6 @@ namespace xAOD {
///
AuxContainerBase::AuxContainerBase( SG::IAuxStore* store )
: SG::IAuxStore(),
m_compression(),
m_auxids(), m_vecs(),
m_store( store ),
m_storeIO( 0 ), m_ownsStore( false ),
......@@ -113,7 +109,6 @@ namespace xAOD {
// Keep the objects locked during copy
std::scoped_lock lck{m_mutex, rhs.m_mutex};
m_compression = rhs.m_compression;
// Clean up after the old dynamic store:
if( m_store && m_ownsStore ) {
......
......@@ -22,7 +22,6 @@
// Local include(s):
#include "xAODCore/AuxSelection.h"
#include "xAODCore/AuxCompression.h"
// Forward declaration(s):
namespace SG {
......@@ -197,8 +196,6 @@ namespace xAOD {
void regAuxVar1( auxid_t auxid, const std::string& name,
CONT& vec );
/// Attributes compression implementation
AuxCompression m_compression;
/// Internal list of all available variables
auxid_set_t m_auxids;
/// Internal list of all managed variables
......
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