Skip to content

Commit e6c0f41

Browse files
committed
io: remove addressed comment about 32/64 bits
1 parent 47ef616 commit e6c0f41

1 file changed

Lines changed: 0 additions & 8 deletions

File tree

io/io/src/TBufferFile.cxx

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2820,7 +2820,6 @@ void TBufferFile::WriteObjectClass(const void *actualObjectStart, const TClass *
28202820
const bool shortRange = (fBufCur - fBuffer) <= kMaxMapCount;
28212821

28222822
// save index of already stored object
2823-
// FIXME/TRUNCATION: potential truncation from 64 to 32 bits
28242823
if (R__likely(shortRange)) {
28252824
// truncation is OK the value we did put in the map is an 30-bit offset
28262825
// and not a pointer
@@ -2832,7 +2831,6 @@ void TBufferFile::WriteObjectClass(const void *actualObjectStart, const TClass *
28322831
// This is needed so that the reader can distinguish between references,
28332832
// bytecounts, and new class definitions.
28342833
ULong64_t objIdx = static_cast<ULong64_t>(idx);
2835-
// FIXME: verify that objIdx is guaranteed to fit in 60-bits, i.e. objIdx <= kMaxLongRange
28362834
assert(objIdx <= kMaxLongRange);
28372835
*this << (objIdx | kLongRangeRefMask);
28382836
}
@@ -2900,7 +2898,6 @@ TClass *TBufferFile::ReadClass(const TClass *clReq, ULong64_t *objTag)
29002898
const bool shortRange = (fBufCur - fBuffer) <= kMaxMapCount;
29012899
bool isNewClassTag = false;
29022900

2903-
// FIXME/TRUNCATION: potential truncation from 64 to 32 bits
29042901
*this >> bcnt;
29052902
if (bcnt == kNewClassTag) {
29062903
isNewClassTag = true;
@@ -2959,7 +2956,6 @@ TClass *TBufferFile::ReadClass(const TClass *clReq, ULong64_t *objTag)
29592956
// in case tag is object tag return tag
29602957
// NOTE: if we return early for reference for longRange, this would be only for shortRange
29612958
if (!isClassTag && !isNewClassTag) {
2962-
// FIXME/TRUNCATION: potential truncation from 64 to 32 bits
29632959
if (objTag)
29642960
*objTag = tag64;
29652961
return 0;
@@ -3045,17 +3041,13 @@ void TBufferFile::WriteClass(const TClass *cl)
30453041
UInt_t clIdx = UInt_t(idx);
30463042

30473043
// save index of already stored class
3048-
// FIXME/TRUNCATION: potential truncation from 64 to 32 bits
3049-
// FIXME/INCORRECTNESS: if clIdx > 0x3FFFFFFF the control bit (2nd highest bit) will be wrong
3050-
// FIXME/INCORRECTNESS: similarly if clIdx > kClassMask (2GB) the code will be wrong
30513044
*this << (clIdx | kClassMask);
30523045
} else {
30533046
// The 64-bit value is stored highest bytes first in the buffer,
30543047
// so when reading just the first 32-bits we get the control bits in place.
30553048
// This is needed so that the reader can distinguish between references,
30563049
// bytecounts, and new class definitions.
30573050
ULong64_t clIdx = static_cast<ULong64_t>(idx);
3058-
// FIXME: verify that clIdx is guaranteed to fit in 60-bits, i.e. clIdx <= kMaxLongRange
30593051
assert(clIdx <= kMaxLongRange);
30603052
*this << (clIdx | kLongRangeClassMask);
30613053
}

0 commit comments

Comments
 (0)