Skip to content
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

Jump to bottom

Cleaning up subProcesses looping. #16292

Merged
merged 3 commits into from Oct 25, 2016
Merged

Cleaning up subProcesses looping. #16292

merged 3 commits into from Oct 25, 2016

Commits on Oct 20, 2016

  1. Fix only spacing errors.

    @knoepfel
    knoepfel committed Oct 20, 2016
    Copy the full SHA
    d29f764 View commit details
    Browse the repository at this point in the history

  2. Changes to avoid repeated 'hasSubProcesses' calls. 

    - Changed subProcesses_ to be a vector<SubProcess> object, instead of smart pointer to same.
  If empty, looping over the object is a nop.
- Change return type of popVParameterSet() to vector<ParameterSet> instead of unique_ptr to same.
  I don't believe this introduced any breaking changes, outside of FWCore.

Conflicts:
	FWCore/Framework/interface/SubProcess.h
	FWCore/Framework/src/EventProcessor.cc
	FWCore/Framework/src/SubProcess.cc
	FWCore/ParameterSet/src/ProcessDesc.cc
    @knoepfel
    knoepfel committed Oct 20, 2016
    Copy the full SHA
    996d24a View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2016

  1. Adjustments based on Chris's suggestions.

    @knoepfel
    knoepfel committed Oct 21, 2016
    Copy the full SHA
    abe3676 View commit details
    Browse the repository at this point in the history