TrigT1CaloByteStream: Fix const problems.
DataVector has had a long-standing bug in which it was possible to get a non-const pointer from a const_iterator. This package was relying on that bug to compile. Rework so that it handles const properly. Classes in this package are used for both packing to bytestream and unpacking from bytestream. To do this, they use they use temporary maps stored in data members with types like std::map<int, LVL1::CpmHits*>. For the case of unpacking from bytestream, this is ok; however, for the case of packing to bytestream, the pointers being entered into the map should actually be const. Reworked in this manner. Bytestream packing is largely the same, with the maps changed to be const. For bytestream unpacking, we create non-const maps as local variables and pass them around as needed. Eventually, it would be nice to get rid of the member variables used for packing as well. Former-commit-id: 5e8c5163
Showing
- Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamTool.cxx 80 additions, 53 deletionsTrigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamTool.cxx
- Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamTool.h 44 additions, 15 deletionsTrigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamTool.h
- Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Tool.cxx 80 additions, 53 deletions...er/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Tool.cxx
- Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Tool.h 44 additions, 15 deletionsTrigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Tool.h
- Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Tool.cxx 80 additions, 56 deletions...er/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Tool.cxx
- Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Tool.h 43 additions, 16 deletionsTrigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Tool.h
- Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamTool.cxx 164 additions, 113 deletions...ger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamTool.cxx
- Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamTool.h 66 additions, 24 deletionsTrigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamTool.h
- Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Tool.cxx 160 additions, 108 deletions...r/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Tool.cxx
- Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Tool.h 66 additions, 24 deletions...ger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Tool.h
- Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Tool.cxx 136 additions, 90 deletions...r/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Tool.cxx
- Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Tool.h 66 additions, 24 deletions...ger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Tool.h
Loading
Please register or sign in to comment