Commit 3bf5d06b authored by Scott Snyder's avatar Scott Snyder Committed by Graeme Stewart
Browse files

Suppress some duplicate dictionaries in Athena builds. (xAODEventInfo-00-00-27)

2015-05-13  scott snyder  <snyder@bnl.gov>

	* Tagging xAODEventInfo-00-00-27.
	* cmt/requirements, xAODEventInfo/selectionAthSuppress.xml:
	Suppress some duplicate dictionaries in Athena builds.

2015-04-03  scott snyder  <snyder@bnl.gov>

	* Tagging xAODEventInfo-00-00-26.
	* Stream operators should be within the namespace of the objects
	on which they operate.  Fix compilation issue with clang 3.4.

2015-03-30  scott snyder  <snyder@bnl.gov>

	* Tagging xAODEventInfo-00-00-25.
	* Root/EventAuxInfo_v1.cxx: Fix uninitialized members.

2015-03-09  Marcin Nowak  <Marcin.Nowak@cern.ch>
	* xAODEventInfo\selection.xml: remove quote from XML comment
	* Tagging xAODEventInfo-00-00-24
...
(Long ChangeLog diff - truncated)
parent 5d215b9b
......@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
// $Id: EventAuxInfo_v1.cxx 667437 2015-05-15 20:10:40Z cohm $
// $Id: EventAuxInfo_v1.cxx 657675 2015-03-30 01:36:11Z ssnyder $
// Local include(s):
#include "xAODEventInfo/versions/EventAuxInfo_v1.h"
......
......@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
// $Id: EventInfo_v1.cxx 669514 2015-05-23 17:45:07Z tcorneli $
// $Id: EventInfo_v1.cxx 658946 2015-04-03 14:17:17Z ssnyder $
// System include(s):
#include <iostream>
......@@ -17,7 +17,7 @@
#include "xAODEventInfo/EventInfoContainer.h"
#include "EventInfoAccessors_v1.h"
namespace {
namespace xAODEventInfoPrivate {
// Forward declaration(s):
template< typename T >
......@@ -48,6 +48,7 @@ namespace {
} // private namespace
namespace xAOD {
using xAODEventInfoPrivate::operator<<;
EventInfo_v1::EventInfo_v1()
: SG::AuxElement(), m_streamTags(), m_updateStreamTags( false ),
......@@ -680,8 +681,6 @@ namespace xAOD {
return;
}
} // namespace xAOD
/// This operator is provided to make it convenient to print debug messages
/// including information about the current event. With something like:
///
......@@ -729,4 +728,4 @@ std::ostream& operator<< ( std::ostream& out, const xAOD::EventInfo_v1& ei ) {
return out;
}
} // namespace xAOD
......@@ -19,4 +19,5 @@ use AtlasReflex AtlasReflex-* External
use AtlasROOT AtlasROOT-* External
apply_pattern lcgdict dict=xAODEventInfo selectionfile=selection.xml \
headerfiles="../xAODEventInfo/xAODEventInfoDict.h"
headerfiles="../xAODEventInfo/xAODEventInfoDict.h" \
extraselection="selectionAthSuppress.xml"
<!-- $Id: selection.xml 612503 2014-08-19 11:58:04Z krasznaa $ -->
<!-- $Id: selection.xml 652717 2015-03-09 16:06:05Z mnowak $ -->
<lcgdict>
<class name="xAOD::EventInfo_v1"
......@@ -48,7 +48,7 @@
<class name="std::vector<std::vector<ElementLink<xAOD::EventInfoContainer_v1> > >" />
<!-- Additional dictionaries for the payload: -->
<class name="std::pair<std::string,std::string>" />
<!-- MN: removing class name="std::pair<std::string,std::string>" as it is already in RELAX -->
<class name="std::vector<std::pair<std::string,std::string> >" />
<class name="std::vector<std::vector<std::pair<std::string,std::string> > >" />
<class name="std::set<uint32_t>" />
......
<exclusion>
<class name="std::set<uint32_t>" />
<class name="std::vector<std::pair<std::string,std::string> >" />
</exclusion>
......@@ -4,7 +4,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
// $Id: EventInfo_v1.h 636390 2014-12-16 21:52:18Z cranshaw $
// $Id: EventInfo_v1.h 658946 2015-04-03 14:17:17Z ssnyder $
#ifndef XAODEVENTINFO_VERSIONS_EVENTINFO_V1_H
#define XAODEVENTINFO_VERSIONS_EVENTINFO_V1_H
......@@ -38,8 +38,8 @@ namespace xAOD {
///
/// @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
///
/// $Revision: 636390 $
/// $Date: 2014-12-16 22:52:18 +0100 (Tue, 16 Dec 2014) $
/// $Revision: 658946 $
/// $Date: 2015-04-03 16:17:17 +0200 (Fri, 03 Apr 2015) $
///
class EventInfo_v1 : public SG::AuxElement {
......@@ -423,11 +423,13 @@ namespace xAOD {
}; // class EventInfo_v1
} // namespace xAOD
/// A helper operator to be able to print debug messages easily
std::ostream& operator<< ( std::ostream& out, const xAOD::EventInfo_v1& ei );
} // namespace xAOD
// Declare the inheritance of the type:
#include "xAODCore/BaseInfo.h"
SG_BASE( xAOD::EventInfo_v1, SG::AuxElement );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment