Skip to content

Moved plugins to FWCore/Integration/plugins #40448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cmsbuild merged 1 commit into from
Jan 12, 2023
Merged

Moved plugins to FWCore/Integration/plugins #40448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion FWCore/Integration/test/AcquireIntFilter.cc → ...e/Integration/plugins/AcquireIntFilter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "FWCore/Framework/interface/global/EDFilter.h"
#include "FWCore/Framework/interface/MakerMacros.h"
#include "FWCore/Framework/interface/PreallocationConfiguration.h"
#include "FWCore/Integration/test/WaitingServer.h"
#include "WaitingServer.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/Utilities/interface/EDGetToken.h"
#include "FWCore/Utilities/interface/InputTag.h"
Expand Down
2 changes: 1 addition & 1 deletion ...re/Integration/test/AcquireIntProducer.cc → ...Integration/plugins/AcquireIntProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "FWCore/Framework/interface/global/EDProducer.h"
#include "FWCore/Framework/interface/MakerMacros.h"
#include "FWCore/Framework/interface/PreallocationConfiguration.h"
#include "FWCore/Integration/test/WaitingServer.h"
#include "WaitingServer.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/Utilities/interface/EDGetToken.h"
#include "FWCore/Utilities/interface/InputTag.h"
Expand Down
2 changes: 1 addition & 1 deletion ...ntegration/test/AcquireIntStreamFilter.cc → ...gration/plugins/AcquireIntStreamFilter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/stream/EDFilter.h"
#include "FWCore/Framework/interface/MakerMacros.h"
#include "FWCore/Integration/test/WaitingService.h"
#include "WaitingService.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/ServiceRegistry/interface/Service.h"
#include "FWCore/Utilities/interface/EDGetToken.h"
Expand Down
2 changes: 1 addition & 1 deletion ...egration/test/AcquireIntStreamProducer.cc → ...ation/plugins/AcquireIntStreamProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/stream/EDProducer.h"
#include "FWCore/Framework/interface/MakerMacros.h"
#include "FWCore/Integration/test/WaitingService.h"
#include "WaitingService.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/ServiceRegistry/interface/Service.h"
#include "FWCore/Utilities/interface/EDGetToken.h"
Expand Down
2 changes: 1 addition & 1 deletion ...ntegration/test/AssociationMapAnalyzer.cc → ...gration/plugins/AssociationMapAnalyzer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ namespace edmtest {
typedef edm::AssociationMap<edm::OneToOne<edm::View<int>, edm::View<int>>> AssocOneToOneView;

explicit AssociationMapAnalyzer(edm::ParameterSet const&);
virtual void analyze(edm::StreamID, edm::Event const& event, edm::EventSetup const&) const override;
void analyze(edm::StreamID, edm::Event const& event, edm::EventSetup const&) const override;

edm::EDGetTokenT<std::vector<int>> inputToken1_;
edm::EDGetTokenT<std::vector<int>> inputToken2_;
Expand Down
2 changes: 1 addition & 1 deletion ...ntegration/test/AssociationMapProducer.cc → ...gration/plugins/AssociationMapProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ namespace edmtest {
class AssociationMapProducer : public edm::one::EDProducer<> {
public:
explicit AssociationMapProducer(edm::ParameterSet const&);
virtual ~AssociationMapProducer();
~AssociationMapProducer() override;

void produce(edm::Event&, edm::EventSetup const&) override;

Expand Down
132 changes: 132 additions & 0 deletions FWCore/Integration/plugins/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
<environment>
<library file="TestPSetAnalyzer.cc,ProducerWithPSetDesc.cc,TestDescriptionComments.cc" name="FWCoreIntegrationTestPSet">
<flags EDM_PLUGIN="1"/>
<use name="DataFormats/Provenance"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/Framework"/>
<use name="FWCore/Utilities"/>
</library>

<library file="ThingProducer.cc,ThingAlgorithm.cc,TrackOfThingsProducer.cc,ThinningTestAnalyzer.cc,ThinnedRefFromTestAnalyzer.cc,DetSetVectorThingProducer.cc,TrackOfDSVThingsProducer.cc,ThinningDSVThingProducer.cc,SlimmingDSVThingProducer.cc,ThinningDSVTestAnalyzer.cc,ThingSource.cc,ThingExtSource.cc,ThingWithMergeProducer.cc,TestGetterOfProducts.cc,PutOrMergeTestSource.cc,TestGetByLabelAnalyzer.cc,ThingAnalyzer.cc"
name="FWCoreIntegrationTestWithThing">
<flags EDM_PLUGIN="1"/>
<use name="FWCore/Framework"/>
<use name="FWCore/Sources"/>
<use name="DataFormats/Common"/>
<use name="DataFormats/TestObjects"/>
</library>

<library file="ThinningThingProducer.cc,SlimmingThingProducer.cc,WhatsIt.cc,GadgetRcd.cc,Doodad.cc,WhatsItESProducer.cc,WhatsItAnalyzer.cc,WhatsItWatcherAnalyzer.cc,DoodadESProducer.cc,DoodadEDLooper.cc,DoodadESSource.cc" name="FWCoreIntegrationTestWithWhatsItDoodad">
<flags EDM_PLUGIN="1"/>
<use name="FWCore/Framework"/>
<use name="DataFormats/TestObjects"/>
</library>

<library file="AssociationMapProducer.cc,AssociationMapAnalyzer.cc,MissingDictionaryTestProducer.cc,ExistingDictionaryTestModules.cc, TableTestModules.cc, TestGlobalOutput.cc, TestLimitedOutput.cc, TestOneOutput.cc, PluginUsingProducer.cc,SwitchProducerProvenanceAnalyzer.cc,ProducerUsingCollector.cc,ExceptionThrowingProducer.cc,ProdigalAnalyzer.cc,IntSource.cc,ViewAnalyzer.cc,TestFindProduct.cc,ManyProductProducer.cc,TestParentage.cc,HierarchicalEDProducer.cc,ThrowingSource.cc, DelayedReaderThrowingSource.cc,TestHistoryKeeping.cc,PathAnalyzer.cc" name="FWCoreIntegrationSomeTestModules">
<flags EDM_PLUGIN="1"/>
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/Sources"/>
<use name="DataFormats/Provenance"/>
<use name="FWCore/MessageLogger"/>
<use name="DataFormats/TestObjects"/>
</library>

<library file="HistProducer.cc" name="TestHistProducer">
<flags EDM_PLUGIN="1"/>
<use name="FWCore/Framework"/>
<use name="root"/>
</library>

<library file="OtherThingProducer.cc,OtherThingAlgorithm.cc,OtherThingAnalyzer.cc,OtherThingRefComparer.cc" name="FWCoreIntegrationOtherThing">
<flags EDM_PLUGIN="1"/>
<use name="DataFormats/Common"/>
<use name="FWCore/Framework"/>
<use name="FWCore/MessageLogger"/>
</library>

<library file="ValueExample.cc" name="FWCoreIntegrationValueExample">
<use name="FWCore/ParameterSet"/>
</library>

<library file="ValueExamplePlugin.cc" name="FWCoreIntegrationValueExamplePlugin">
<flags EDM_PLUGIN="1"/>
<lib name="FWCoreIntegrationValueExample"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/ServiceRegistry"/>
</library>

<library file="UseValueExampleAnalyzer.cc" name="UseValueExampleAnalyzer">
<lib name="FWCoreIntegrationValueExample"/>
<flags EDM_PLUGIN="1"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/Framework"/>
</library>

<library file="AcquireIntProducer.cc, AcquireIntFilter.cc, AcquireIntStreamProducer.cc, AcquireIntStreamFilter.cc, WaitingService.cc, WaitingServer.cc" name="FWCoreIntegrationWaitingServiceModules">
<flags EDM_PLUGIN="1"/>
<use name="FWCore/Framework"/>
<use name="DataFormats/TestObjects"/>
<use name="FWCore/Concurrency"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/ServiceRegistry"/>
</library>


<library file="PathsAndConsumesOfModulesTestService.cc" name="FWCoreIntegrationPathsAndConsumesOfModulesTestService">
<flags EDM_PLUGIN="1"/>
<use name="DataFormats/Provenance"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/ServiceRegistry"/>
</library>

<library file="ConcurrentIOVESSource.cc,ConcurrentIOVESProducer.cc,ConcurrentIOVAnalyzer.cc,GadgetRcd.cc,IOVTestInfo.cc,RunLumiESAnalyzer.cc,RunLumiESSource.cc,TestESSource.cc,TestESConcurrentSource.cc" name="ConcurrentIOVESSource">
<flags EDM_PLUGIN="1"/>
<use name="FWCore/Integration"/>
<use name="FWCore/Framework"/>
</library>

<library file="ESTestProducers.cc,ESTestAnalyzers.cc" name="ESTestModules">
<flags EDM_PLUGIN="1"/>
<use name="DataFormats/Provenance"/>
<use name="FWCore/Framework"/>
<use name="FWCore/Integration"/>
<use name="FWCore/MessageLogger"/>
<use name="FWCore/ParameterSet"/>
</library>

<library file="TestInterProcessProd.cc" name="TestInterProcessProd">
<flags EDM_PLUGIN="1"/>
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/Sources"/>
<use name="FWCore/SharedMemory"/>
<use name="boost"/>
</library>

<library file="TestInterProcessRandomProd.cc,RandomIntProducer.cc" name="TestInterProcessRandomProd">
<flags EDM_PLUGIN="1"/>
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/Sources"/>
<use name="FWCore/SharedMemory"/>
<use name="FWCore/Utilities"/>
<use name="DataFormats/TestObjects"/>
<use name="boost"/>
<use name="clhep"/>
</library>
<library file="TestServicesOnNonFrameworkThreadsAnalyzer.cc" name = "TestServicesOnNonFrameworkThreadsAnalyzer">
<flags EDM_PLUGIN="1"/>
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/MessageLogger"/>
<use name="clhep"/>
</library>

<library file="TransformIntProducer.cc, TransformIntStreamProducer.cc, TransformAsyncIntProducer.cc, TransformAsyncIntStreamProducer.cc" name = "FWCoreIntegrationTransformIntProducer">
<flags EDM_PLUGIN="1"/>
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
</library>

</environment>
2 changes: 1 addition & 1 deletion ...Integration/test/ConcurrentIOVAnalyzer.cc → ...egration/plugins/ConcurrentIOVAnalyzer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "FWCore/Framework/interface/EventSetup.h"
#include "FWCore/Framework/interface/MakerMacros.h"
#include "FWCore/Integration/interface/ESTestRecords.h"
#include "FWCore/Integration/test/IOVTestInfo.h"
#include "IOVTestInfo.h"
#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
Expand Down
2 changes: 1 addition & 1 deletion ...tegration/test/ConcurrentIOVESProducer.cc → ...ration/plugins/ConcurrentIOVESProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include "FWCore/Framework/interface/ESProducer.h"
#include "FWCore/Framework/interface/ModuleFactory.h"
#include "FWCore/Integration/interface/ESTestRecords.h"
#include "FWCore/Integration/test/IOVTestInfo.h"
#include "IOVTestInfo.h"
#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
Expand Down
2 changes: 1 addition & 1 deletion ...Integration/test/ConcurrentIOVESSource.cc → ...egration/plugins/ConcurrentIOVESSource.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include "FWCore/Framework/interface/ValidityInterval.h"
#include "FWCore/Integration/interface/ESTestData.h"
#include "FWCore/Integration/interface/ESTestRecords.h"
#include "FWCore/Integration/test/IOVTestInfo.h"
#include "IOVTestInfo.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
Expand Down
0 ...ation/test/DelayedReaderThrowingSource.cc → ...on/plugins/DelayedReaderThrowingSource.cc
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...gration/test/DetSetVectorThingProducer.cc → ...tion/plugins/DetSetVectorThingProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "DataFormats/Common/interface/DetSetVectorNew.h"
#include "DataFormats/TestObjects/interface/ThingCollection.h"
#include "FWCore/Integration/test/ThingAlgorithm.h"
#include "ThingAlgorithm.h"
#include "FWCore/Framework/interface/global/EDProducer.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/MakerMacros.h"
Expand Down
2 changes: 1 addition & 1 deletion FWCore/Integration/test/Doodad.cc → FWCore/Integration/plugins/Doodad.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// system include files

// user include files
#include "FWCore/Integration/test/Doodad.h"
#include "Doodad.h"

#include "FWCore/Utilities/interface/typelookup.h"

Expand Down
0 FWCore/Integration/test/Doodad.h → FWCore/Integration/plugins/Doodad.h
View file
Open in desktop
File renamed without changes.
0 FWCore/Integration/test/DoodadEDLooper.cc → FWCore/Integration/plugins/DoodadEDLooper.cc
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions FWCore/Integration/test/DoodadESProducer.cc → ...e/Integration/plugins/DoodadESProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
#include "FWCore/Framework/interface/ESProducer.h"
#include "FWCore/Framework/interface/ModuleFactory.h"

#include "FWCore/Integration/test/Doodad.h"
#include "FWCore/Integration/test/GadgetRcd.h"
#include "Doodad.h"
#include "GadgetRcd.h"

// system include files
#include <memory>
Expand All @@ -35,7 +35,7 @@ namespace edmtest {
class DoodadESProducer : public edm::ESProducer {
public:
DoodadESProducer(edm::ParameterSet const&);
~DoodadESProducer();
~DoodadESProducer() override;

typedef std::unique_ptr<Doodad> ReturnType;

Expand Down
14 changes: 7 additions & 7 deletions FWCore/Integration/test/DoodadESSource.cc → FWCore/Integration/plugins/DoodadESSource.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"

#include "FWCore/Integration/test/GadgetRcd.h"
#include "FWCore/Integration/test/Doodad.h"
#include "GadgetRcd.h"
#include "Doodad.h"
#include "FWCore/Utilities/interface/EDMException.h"

namespace edmtest {
Expand All @@ -33,14 +33,14 @@ namespace edmtest {
static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);

protected:
virtual void setIntervalFor(const edm::eventsetup::EventSetupRecordKey&,
const edm::IOVSyncValue& iTime,
edm::ValidityInterval& iInterval);
void setIntervalFor(const edm::eventsetup::EventSetupRecordKey&,
const edm::IOVSyncValue& iTime,
edm::ValidityInterval& iInterval) override;

private:
DoodadESSource(const DoodadESSource&); // stop default
DoodadESSource(const DoodadESSource&) = delete; // stop default

const DoodadESSource& operator=(const DoodadESSource&); // stop default
const DoodadESSource& operator=(const DoodadESSource&) = delete; // stop default

// ---------- member data --------------------------------
unsigned int nCalls_;
Expand Down
4 changes: 2 additions & 2 deletions FWCore/Integration/test/ESTestAnalyzers.cc → ...re/Integration/plugins/ESTestAnalyzers.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ namespace edmtest {
class ESTestAnalyzerA : public edm::stream::EDAnalyzer<> {
public:
explicit ESTestAnalyzerA(edm::ParameterSet const&);
virtual void analyze(const edm::Event&, const edm::EventSetup&);
void analyze(const edm::Event&, const edm::EventSetup&) override;

static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);

Expand Down Expand Up @@ -70,7 +70,7 @@ namespace edmtest {
class ESTestAnalyzerB : public edm::one::EDAnalyzer<> {
public:
explicit ESTestAnalyzerB(edm::ParameterSet const&);
virtual void analyze(const edm::Event&, const edm::EventSetup&);
void analyze(const edm::Event&, const edm::EventSetup&) override;

static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);

Expand Down
0 FWCore/Integration/test/ESTestProducers.cc → ...re/Integration/plugins/ESTestProducers.cc
View file
Open in desktop
File renamed without changes.
0 ...gration/test/ExceptionThrowingProducer.cc → ...tion/plugins/ExceptionThrowingProducer.cc
View file
Open in desktop
File renamed without changes.
0 ...ion/test/ExistingDictionaryTestModules.cc → .../plugins/ExistingDictionaryTestModules.cc
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion FWCore/Integration/test/GadgetRcd.cc → FWCore/Integration/plugins/GadgetRcd.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
// Author: Chris Jones
// Created: Fri Jun 24 13:44:48 EDT 2005

#include "FWCore/Integration/test/GadgetRcd.h"
#include "GadgetRcd.h"
#include "FWCore/Framework/interface/eventsetuprecord_registration_macro.h"

EVENTSETUP_RECORD_REG(GadgetRcd);
0 FWCore/Integration/test/GadgetRcd.h → FWCore/Integration/plugins/GadgetRcd.h
View file
Open in desktop
File renamed without changes.
0 ...Integration/test/HierarchicalAlgorithms.h → ...egration/plugins/HierarchicalAlgorithms.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ntegration/test/HierarchicalEDProducer.cc → ...gration/plugins/HierarchicalEDProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "FWCore/Framework/interface/MakerMacros.h"
#include "FWCore/Integration/test/HierarchicalEDProducer.h"
#include "HierarchicalEDProducer.h"

namespace edmtest {

Expand Down
2 changes: 1 addition & 1 deletion ...Integration/test/HierarchicalEDProducer.h → ...egration/plugins/HierarchicalEDProducer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/global/EDProducer.h"
#include "FWCore/Integration/test/HierarchicalAlgorithms.h"
#include "HierarchicalAlgorithms.h"

namespace edmtest {
class HierarchicalEDProducer : public edm::global::EDProducer<> {
Expand Down
2 changes: 1 addition & 1 deletion FWCore/Integration/test/HistProducer.cc → FWCore/Integration/plugins/HistProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "TH1F.h"

#include "FWCore/Integration/test/HistProducer.h"
#include "HistProducer.h"
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/MakerMacros.h"

Expand Down
0 FWCore/Integration/test/HistProducer.h → FWCore/Integration/plugins/HistProducer.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion FWCore/Integration/test/IOVTestInfo.cc → FWCore/Integration/plugins/IOVTestInfo.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// Created: 21 March 2019
//

#include "FWCore/Integration/test/IOVTestInfo.h"
#include "IOVTestInfo.h"

#include "FWCore/Utilities/interface/typelookup.h"

Expand Down
0 FWCore/Integration/test/IOVTestInfo.h → FWCore/Integration/plugins/IOVTestInfo.h
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions FWCore/Integration/test/IntSource.cc → FWCore/Integration/plugins/IntSource.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ namespace edm {
class IntSource : public ProducerSourceBase {
public:
explicit IntSource(ParameterSet const&, InputSourceDescription const&);
~IntSource();
~IntSource() override;
static void fillDescriptions(ConfigurationDescriptions& descriptions);

private:
virtual bool setRunAndEventInfo(EventID& id, TimeValue_t& time, edm::EventAuxiliary::ExperimentType& eType);
virtual void produce(Event&);
bool setRunAndEventInfo(EventID& id, TimeValue_t& time, edm::EventAuxiliary::ExperimentType& eType) override;
void produce(Event&) override;
};

IntSource::IntSource(ParameterSet const& pset, InputSourceDescription const& desc)
Expand Down
0 ...e/Integration/test/ManyProductProducer.cc → ...ntegration/plugins/ManyProductProducer.cc
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ion/test/MissingDictionaryTestProducer.cc → .../plugins/MissingDictionaryTestProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ namespace edmtest {
class MissingDictionaryTestProducer : public edm::one::EDProducer<> {
public:
explicit MissingDictionaryTestProducer(edm::ParameterSet const&);
virtual ~MissingDictionaryTestProducer();
~MissingDictionaryTestProducer() override;

void produce(edm::Event&, edm::EventSetup const&) override;

Expand Down
4 changes: 2 additions & 2 deletions ...e/Integration/test/OtherThingAlgorithm.cc → ...ntegration/plugins/OtherThingAlgorithm.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "FWCore/Integration/test/OtherThingAlgorithm.h"
#include "OtherThingAlgorithm.h"
#include "FWCore/Framework/interface/Event.h"
#include "DataFormats/TestObjects/interface/OtherThing.h"
#include "DataFormats/Common/interface/Handle.h"
Expand All @@ -11,7 +11,7 @@ namespace edmtest {
bool refsAreTransient) const {
const size_t numToMake = 20;
result.reserve(numToMake);
ThingCollection const* null = 0;
ThingCollection const* null = nullptr;
ThingCollection const* parent = nullptr;
if (useRefs) {
parent = parentHandle.product();
Expand Down
0 ...re/Integration/test/OtherThingAlgorithm.h → ...Integration/plugins/OtherThingAlgorithm.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...re/Integration/test/OtherThingAnalyzer.cc → ...Integration/plugins/OtherThingAnalyzer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace edmtest {
public:
explicit OtherThingAnalyzer(edm::ParameterSet const& pset);

virtual void analyze(edm::Event const& e, edm::EventSetup const& c) override;
void analyze(edm::Event const& e, edm::EventSetup const& c) override;

void doit(edm::Event const& event, std::string const& label);

Expand Down
2 changes: 1 addition & 1 deletion ...re/Integration/test/OtherThingProducer.cc → ...Integration/plugins/OtherThingProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/global/EDProducer.h"

#include "FWCore/Integration/test/OtherThingAlgorithm.h"
#include "OtherThingAlgorithm.h"
#include "FWCore/Utilities/interface/EDGetToken.h"
#include "FWCore/Utilities/interface/EDPutToken.h"
#include "FWCore/Utilities/interface/InputTag.h"
Expand Down
Loading