From 1e245b95d359eeea22e93997cd4a104c435da152 Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Tue, 8 Nov 2016 18:32:43 +0100
Subject: [PATCH] 'Fix compilation with gcc6.' (AthenaPoolTestData-00-00-41)
* Tagging AthenaPoolTestData-00-00-41.
* AthenaPoolTestData/AthenaPoolTestD.h: Fix compilation with
gcc6.
2016-06-07 scott snyder <snyder@bnl.gov>
* Tagging AthenaPoolTestData-00-00-40.
* AthenaPoolTestData/TrigPath.h: Fix clang warning.
* Tagging AthenaPoolTestData-00-00-39.
* Coverity 12224-12226: Use default copy ctors.
Former-commit-id: 417780c2f101be84ac6a4311f28dc8389aefb0ca
---
.../AthenaPoolTestData/AthenaPoolTestD.h | 11 +----------
.../AthenaPoolTestData/AthenaPoolTestMapData.h | 1 -
.../AthenaPoolTestData/AthenaPoolTestMapDataLink.h | 10 ----------
.../AthenaPoolTestData/AthenaPoolTestData/TrigPath.h | 3 ++-
.../AthenaPoolTestData/src/AthenaPoolTestMapData.cxx | 6 ------
5 files changed, 3 insertions(+), 28 deletions(-)
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/AthenaPoolTestD.h b/AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/AthenaPoolTestD.h
index 9446b966742..9d37e09b187 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/AthenaPoolTestD.h
+++ b/AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/AthenaPoolTestD.h
@@ -24,20 +24,11 @@
#ifndef ATHENAPOOLTESTDATA_ATHENAPOOLTESTD_H
# define ATHENAPOOLTESTDATA_ATHENAPOOLTESTD_H
-//<<<<<< INCLUDES >>>>>>
#include "AthenaPoolTestData/AthenaPoolTestC.h"
//#include "CLHEP/Geometry/Point3D.h"
-//#include <string>
+#include <string>
-//<<<<<< PUBLIC DEFINES >>>>>>
-//<<<<<< PUBLIC CONSTANTS >>>>>>
-//<<<<<< PUBLIC TYPES >>>>>>
-//<<<<<< PUBLIC VARIABLES >>>>>>
-//<<<<<< PUBLIC FUNCTIONS >>>>>>
-//<<<<<< CLASS DECLARATIONS >>>>>>
-
-class string;
class AthenaPoolTestD : public AthenaPoolTestC
{
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/AthenaPoolTestMapData.h b/AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/AthenaPoolTestMapData.h
index 5f8e351d074..e0bac7cb0e6 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/AthenaPoolTestMapData.h
+++ b/AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/AthenaPoolTestMapData.h
@@ -39,7 +39,6 @@ public:
AthenaPoolTestMapData();
AthenaPoolTestMapData (const std::vector< Deposit >& deposits, int simDataWord = 0);
- AthenaPoolTestMapData (const AthenaPoolTestMapData& other);
virtual ~AthenaPoolTestMapData();
int word() const; // Get the packed simdata word
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/AthenaPoolTestMapDataLink.h b/AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/AthenaPoolTestMapDataLink.h
index 0f59c36b23d..159dadc5657 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/AthenaPoolTestMapDataLink.h
+++ b/AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/AthenaPoolTestMapDataLink.h
@@ -41,7 +41,6 @@ public:
AthenaPoolTestMapDataLink();
AthenaPoolTestMapDataLink(index_type barCode, index_type eventIndex = 0);
AthenaPoolTestMapDataLink(const MyDummyClass* p, index_type eventIndex = 0);
- AthenaPoolTestMapDataLink(const AthenaPoolTestMapDataLink& rhs);
//@}
/// \name indexing accessors (e.g. for writing)
@@ -56,7 +55,6 @@ public:
public:
ExtendedBarCode();
ExtendedBarCode(index_type barcode, index_type eventIndex);
- ExtendedBarCode(const ExtendedBarCode& rhs);
unsigned long barcode() const;
unsigned short eventIndex() const;
@@ -79,9 +77,6 @@ inline AthenaPoolTestMapDataLink::ExtendedBarCode::ExtendedBarCode(index_type ba
assert(eventIndex < std::numeric_limits<unsigned short>::max());
}
-inline AthenaPoolTestMapDataLink::ExtendedBarCode::ExtendedBarCode(const ExtendedBarCode& rhs) :
- m_BC(rhs.m_BC), m_evtIndex(rhs.m_evtIndex) {}
-
inline unsigned long \
AthenaPoolTestMapDataLink::ExtendedBarCode::barcode() const
{
@@ -105,11 +100,6 @@ inline
AthenaPoolTestMapDataLink::AthenaPoolTestMapDataLink(const MyDummyClass* /*p*/, index_type eventIndex) :
m_particle(0), m_extBarcode(0, eventIndex) {}
-inline
-AthenaPoolTestMapDataLink::AthenaPoolTestMapDataLink(const AthenaPoolTestMapDataLink& rhs) :
- m_particle(rhs.m_particle),
- m_extBarcode(rhs.m_extBarcode) {}
-
inline int
AthenaPoolTestMapDataLink::barcode() const
{ return int(m_extBarcode.barcode()); } //FIXME ret type
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/TrigPath.h b/AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/TrigPath.h
index 2b4eec7b2ed..c1886604fe6 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/TrigPath.h
+++ b/AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/TrigPath.h
@@ -19,8 +19,9 @@
#include <string>
#include <set>
-struct TrigPath
+class TrigPath
{
+public:
TrigPath() : pathID(-1), l1bit(-1), l2bit(0) {}
TrigPath(int l1, int l2, int p) :
pathID(p), l1bit(l1), l2bit(l2) {}
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTestData/src/AthenaPoolTestMapData.cxx b/AtlasTest/DatabaseTest/AthenaPoolTestData/src/AthenaPoolTestMapData.cxx
index 287d8e68d81..e3d8020b9a0 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTestData/src/AthenaPoolTestMapData.cxx
+++ b/AtlasTest/DatabaseTest/AthenaPoolTestData/src/AthenaPoolTestMapData.cxx
@@ -40,12 +40,6 @@ AthenaPoolTestMapData::AthenaPoolTestMapData (const std::vector<Deposit>& deposi
m_deposits = deposits;
}
-AthenaPoolTestMapData::AthenaPoolTestMapData (const AthenaPoolTestMapData& other)
- :m_word(other.m_word),
- m_deposits(other.m_deposits)
-{}
-
-
AthenaPoolTestMapData::~AthenaPoolTestMapData()
{
// delete[] m_p_deposits;
--
GitLab