Changes in external/fastjet/MinHeap.cc [b7b836a:cb80e6f] in git
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
external/fastjet/MinHeap.cc
rb7b836a rcb80e6f 1 1 //FJSTARTHEADER 2 // $Id: MinHeap.cc 4 354 2018-04-22 07:12:37Z salam$2 // $Id: MinHeap.cc 4442 2020-05-05 07:50:11Z soyez $ 3 3 // 4 // Copyright (c) 2005-20 18, Matteo Cacciari, Gavin P. Salam and Gregory Soyez4 // Copyright (c) 2005-2020, Matteo Cacciari, Gavin P. Salam and Gregory Soyez 5 5 // 6 6 //---------------------------------------------------------------------- … … 110 110 111 111 // now compare current location to children (at 2*loc+1, 2*loc+2) 112 ValueLoc * child = &(_heap[2*loc+1]); 112 //ValueLoc * child = &(_heap[2*loc+1]); 113 // GPS 2020-04-07: changed the way the following line 114 // is expressed, so as to work around issue reported by 115 // Andrii Verbyitskyi where compilation with gcc's 116 // -D_GLIBCXX_ASSERTIONS=1 -D_GLIBCXX_SANITIZE_VECTOR=1 117 // results in a crash because the compiler thinks we 118 // are accessing the vector at a location that is sometimes 119 // invalid, whereas we are just getting the address 120 ValueLoc * child = &(_heap[0]) + (2*loc+1); 113 121 if (child < heap_end && child->minloc->value < here->minloc->value ) { 114 122 here->minloc = child->minloc;
Note:
See TracChangeset
for help on using the changeset viewer.