Merge branch 'pair.EventInfo-20181116' into 'master'

EventInfo: Tweak selection rules for gcc 8.2.1.

See merge request atlas/athena!15987

Event/EventInfo/EventInfo/EventInfoDict.h

 // dear emacs, this is -*- 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
 */
 
 #ifndef EVENTINFO_EVENTINFODICT_H
@@ -90,6 +90,7 @@ struct EventInfoInstan
 {
   std::list<PileUpEventInfo::SubEvent>::iterator i1;
   std::list<PileUpEventInfo::SubEvent>::const_iterator i2;
+  std::pair<CLID, std::string> p;
 };
 
 #endif // EVENTINFO_EVENTINFODICT_H

Event/EventInfo/EventInfo/selection.xml

@@ -9,7 +9,7 @@
   <class name="TagInfo" />
   <class name="EventStreamInfo" id="2415BBB1-D76A-43CA-B4F6-34A9531EB10B"/>
   <class name="std::set<std::pair<CLID, std::string> >"/>
-  <class name="std::pair<CLID, std::string>"/>
+  <class pattern="*pair*<unsigned*basic_string<char,*char_traits<char>,*allocator<char> > >"/>
   <class name="std::set<EventType>"/>
   <class name="PileUpEventInfo" id="6A58157B-6B6E-430F-A72A-EAAA4BDC4AE2">
     <field name="m_subEvents" transient="true"/>