Skip to content
Snippets Groups Projects

Merge master into FTRetinaSeedRawBanks

Merged Merge master into FTRetinaSeedRawBanks
master into fterzuol/FTRetinaSeedRawBanks
Merged Francesco Terzuoli requested to merge master into fterzuol/FTRetinaSeedRawBanks

Realign FTRetinaSeedRawBanks with master branch

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
Rich/RichFutureKernel/include/RichFutureKernel/RichCommonBase.h
44 44 namespace Future {
45 45
46 /** Returns the full location of the container in the Data Store
47 *
48 * @param pObj Data object
49 *
50 * @return Location of given data object
51 */
52 template <typename TYPE>
53 inline auto objectLocation( const TYPE& pObj ) {
54 return ( pObj.registry() ? pObj.registry()->identifier() : "UnRegistered" );
55 }
56 template <typename TYPE>
57 inline auto objectLocation( const TYPE* pObj ) {
58 return ( !pObj ? "Null DataObject !" : objectLocation( *pObj ) );
59 }
  • G
    Gerhard Raven @graven ·
    Developer

    there is no need for templates here -- it actually relies on TYPE inheriting from DataObject, i.e. this could be:

    
    inline auto objectLocation( const DataObject& pObj ) {
      return ( pObj.registry() ? pObj.registry()->identifier() : "UnRegistered" );
    }

    inline auto objectLocation( const DataObject* pObj ) {
      return ( !pObj ? "Null DataObject !" : objectLocation( *pObj ) );
    }
    Edited by Gerhard Raven
  • Please register or sign in to reply
  • Francesco Terzuoli marked this merge request as ready

    marked this merge request as ready

  • Francesco Terzuoli mentioned in commit d7e762f6

    mentioned in commit d7e762f6

  • Francesco Terzuoli merged

    merged

    • Please register or sign in to reply