Skip to content

Commit 3524249

Browse files
authored
[core] autoexpand convert size to ulong
as suggested by pcanal and fix membercomments ref files
1 parent a3fb05a commit 3524249

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

core/base/inc/TBuffer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ class TBuffer : public TObject {
9999
void DetachBuffer() { fBuffer = nullptr; }
100100
Int_t Length() const { return (Int_t)(fBufCur - fBuffer); }
101101
void Expand(Long64_t newsize, Bool_t copy = kTRUE); // expand buffer to newsize
102-
void AutoExpand(Long64_t size_needed); // expand buffer to newsize
102+
void AutoExpand(ULong64_t size_needed); // expand buffer to newsize
103103
Bool_t ByteSwapBuffer(Long64_t n, EDataType type); // Byte-swap N primitive-elements in the buffer
104104

105105
virtual Bool_t CheckObject(const TObject *obj) = 0;

core/base/src/TBuffer.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ TBuffer::~TBuffer()
154154
/// If the size_needed is larger than the current size, the policy
155155
/// is to expand to double the current size or the size_needed which ever is largest.
156156

157-
void TBuffer::AutoExpand(Long64_t size_needed)
157+
void TBuffer::AutoExpand(ULong64_t size_needed)
158158
{
159159
if (size_needed > kMaxBufferSize) {
160160
Fatal("AutoExpand","Request to expand a too large buffer: 0x%llx for a max of 0x%x.", size_needed, kMaxBufferSize);

roottest/root/meta/MemberComments.ref

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -542,9 +542,9 @@ OBJ: TList TList Doubly linked list : 0
542542
OBJ: TMethod Write : 0
543543
Long64_t TObject::Write(const char* name = nullptr, Int_t option = 0, Long64_t bufsize = 0) const
544544
OBJ: TMethod Write : 0
545-
Int_t TObject::Write(const char* name = nullptr, Int_t option = 0, Int_t bufsize = 0)
545+
Long64_t TObject::Write(const char* name = nullptr, Int_t option = 0, Int_t bufsize = 0)
546546
OBJ: TMethod Write : 0
547-
Int_t TObject::Write(const char* name = nullptr, Int_t option = 0, Int_t bufsize = 0) const
547+
Long64_t TObject::Write(const char* name = nullptr, Int_t option = 0, Int_t bufsize = 0) const
548548
OBJ: TMethod ls : 0
549549
void TLine::ls(Option_t* option = "") const
550550
OBJ: TMethod ls : 0

roottest/root/meta/MemberComments_win32.ref

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -542,9 +542,9 @@ OBJ: TList TList Doubly linked list : 0
542542
OBJ: TMethod Write : 0
543543
Long64_t TObject::Write(const char* name = nullptr, Int_t option = 0, Long64_t bufsize = 0) const
544544
OBJ: TMethod Write : 0
545-
Int_t TObject::Write(const char* name = nullptr, Int_t option = 0, Int_t bufsize = 0)
545+
Long64_t TObject::Write(const char* name = nullptr, Int_t option = 0, Int_t bufsize = 0)
546546
OBJ: TMethod Write : 0
547-
Int_t TObject::Write(const char* name = nullptr, Int_t option = 0, Int_t bufsize = 0) const
547+
Long64_t TObject::Write(const char* name = nullptr, Int_t option = 0, Int_t bufsize = 0) const
548548
OBJ: TMethod ls : 0
549549
void TLine::ls(Option_t* option = "") const
550550
OBJ: TMethod ls : 0

roottest/root/meta/MemberComments_win64.ref

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -542,9 +542,9 @@ OBJ: TList TList Doubly linked list : 0
542542
OBJ: TMethod Write : 0
543543
Long64_t TObject::Write(const char* name = nullptr, Int_t option = 0, Long64_t bufsize = 0) const
544544
OBJ: TMethod Write : 0
545-
Int_t TObject::Write(const char* name = nullptr, Int_t option = 0, Int_t bufsize = 0)
545+
Long64_t TObject::Write(const char* name = nullptr, Int_t option = 0, Int_t bufsize = 0)
546546
OBJ: TMethod Write : 0
547-
Int_t TObject::Write(const char* name = nullptr, Int_t option = 0, Int_t bufsize = 0) const
547+
Long64_t TObject::Write(const char* name = nullptr, Int_t option = 0, Int_t bufsize = 0) const
548548
OBJ: TMethod ls : 0
549549
void TLine::ls(Option_t* option = "") const
550550
OBJ: TMethod ls : 0

0 commit comments

Comments
 (0)