Skip to content
Snippets Groups Projects
Commit 58cef15a authored by Vakhtang Tsulaia's avatar Vakhtang Tsulaia
Browse files

Merge branch 'gcc9.AthContainers-20181211' into 'master'

AthContainers: Fix gcc9 warnings.

See merge request atlas/athena!16679
parents 4a084ce7 4e140741
No related branches found
No related tags found
No related merge requests found
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
// $Id$
......@@ -38,7 +38,7 @@ class ViewVectorBase
{
public:
/// Destructor.
virtual ~ViewVectorBase();
virtual ~ViewVectorBase() = default;
/**
......
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
// $Id$
......@@ -52,15 +52,6 @@ SG::AuxVectorData* getContainer (T* p)
namespace SG {
/**
* @brief Destructor.
*/
inline
ViewVectorBase::~ViewVectorBase()
{
}
/**
* @brief Clear the persistent data.
*/
......
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
......@@ -77,7 +77,7 @@ class FluffContainer : public DataVector<DerivedFluff>
{
public:
FluffContainer() : DataVector<DerivedFluff>() { };
virtual ~FluffContainer() {}
virtual ~FluffContainer() = default;
};
......
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
// $Id$
......@@ -117,6 +117,8 @@ void check_dtor_log(int a=-1,int b=-1,int c=-1,int d=-1, int e=-1, int f=-1)
struct AA
{
AA (int the_x=0): x(the_x) {}
AA (const AA&) = default;
AA& operator= (const AA&) = default;
~AA() { dtor_log.push_back (x); }
int x;
bool operator< (const AA& other) const { return x < other.x; }
......@@ -198,7 +200,8 @@ CLASS_DEF( DataVector<Q> , 9886 , 1 )
struct AAux : public SG::AuxElement
{
AAux (int the_x=0) : x(the_x) { }
//AAux (const AAux& other) : SG::AuxElement(other), x(other.x) {}
AAux (const AAux& other) = default;
AAux& operator= (const AAux& other) = default;
virtual ~AAux() { dtor_log.push_back (x); }
int x;
bool operator< (const AAux& other) const { return x < other.x; }
......
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