Skip to content
Snippets Groups Projects

Last minute fixes for v32r0

Merged Marco Clemencic requested to merge clemenci/Gaudi:last-minute-fixes into master
All threads resolved!
Edited by Marco Clemencic

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
258 260 // m_errorCount = 0; // done during start
259 261
260 262 // lock the context service
261 Gaudi::Utils::AlgContext cnt( this, registerContext() ? contextSvc().get() : nullptr, EventContext{} );
263 EventContext dummyCtx; // this is needed because AlgContext keeps a reference so we cannot use a temporary
  • in that case, made add a constructor which takes an rvalue ref to EventContext, and then explicitly = delete it so that trying to construct an AlgContext with a temporary doesn't compile...

    Edited by Gerhard Raven
  • specifically:

    diff --git a/GaudiKernel/GaudiKernel/IAlgContextSvc.h b/GaudiKernel/GaudiKernel/IAlgContextSvc.h
    index 8398cbba0..ef6c8578c 100644
    --- a/GaudiKernel/GaudiKernel/IAlgContextSvc.h
    +++ b/GaudiKernel/GaudiKernel/IAlgContextSvc.h
    @@ -82,6 +82,7 @@ namespace Gaudi {
            *  @param context current event context
            */
           AlgContext( IAlgorithm* alg, IAlgContextSvc* svc, const EventContext& context );
    +      AlgContext( IAlgorithm* alg, IAlgContextSvc* svc, EventContext&& context ) = delete;
     
           /** constructor from the service and the algorithm
            *  Internally invokes IAlgContextSvc::setCurrentAlg
    
  • Thanks for the idea! At some point (for another case) I was looking for a way to prevent passing temporaries, and this is the answer :)

    I'll do it another day.

  • for some reason this discussion does not require a resolution (did you comment directly on the commit? I answer to myself: yes, the discussion header says that the comment was on the commit and not on the diff)... I'll have to create the issue by hand :(

    Edited by Marco Clemencic
  • Please register or sign in to reply
  • Marco Clemencic resolved all discussions

    resolved all discussions

  • mentioned in issue #72 (closed)

  • Marco Clemencic resolved all discussions

    resolved all discussions

  • mentioned in issue #73 (closed)

  • mentioned in commit lhcb/Phys@f9d37e92

  • mentioned in merge request lhcb/Phys!563 (closed)

  • mentioned in commit lhcb/Phys@215c1f70

  • Gerhard Raven mentioned in merge request lhcb/Hlt!625 (closed)

    mentioned in merge request lhcb/Hlt!625 (closed)

  • Edited by Software for LHCb
  • added 1 commit

    • b887e28c - Fix propagation of RootInTES from parents to children

    Compare with previous version

  • Marco Clemencic changed the description

    changed the description

  • Yes, I suspected that too, thanks.

  • mentioned in commit lhcb/Phys@4fdc7472

  • Please register or sign in to reply
    Loading