Fork me on GitHub

Ignore:
Timestamp:
Nov 20, 2013, 9:52:59 PM (11 years ago)
Author:
pavel <pavel@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
fc39685
Parents:
88a9b72
Message:

upgrade fastjet to 3.0.6

File:
1 edited

Legend:

Unmodified
Added
Removed

  • external/fastjet/CompositeJetStructure.cc

    r88a9b72 rd69dfe4  
    4545                                             const JetDefinition::Recombiner * recombiner)
    4646  : _pieces(initial_pieces){
     47
     48#ifndef __FJCORE__
    4749  // deal with area support (cache the area if needed)
    4850  //--------------------------------------------------
    … …  
    6870    _area_4vector_ptr = 0;
    6971  }
     72#else
     73  if (recombiner){};  // ugly trick to prevent a gcc warning
     74  _area_4vector_ptr = 0;
     75#endif
    7076
    7177}
    … …  
    115121
    116122
     123#ifndef __FJCORE__
    117124// area-related material
    118125
    … …  
    167174}
    168175
     176#endif  // __FJCORE__
    169177
    170178
Note: See TracChangeset for help on using the changeset viewer.