Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions core/.clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
BasedOnStyle: InheritParentConfig

AlignConsecutiveAssignments:
Enabled: true
AcrossEmptyLines: false
AcrossComments: true
AlignCompound: true
PadOperators: true
AlignConsecutiveBitFields:
Enabled: true
AcrossEmptyLines: false
AcrossComments: false
AlignConsecutiveDeclarations:
Enabled: true
# Part of clang-format 20.1.0
AlignFunctionDeclarations: true

# Part of clang-format 22
# IndentPPDirectives: Leave
IndentPPDirectives: None
22 changes: 22 additions & 0 deletions core/base/inc/TBuffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include "TClass.h"
#include "Bytes.h"

#include <limits>
#include <vector>
#include <string>

Expand Down Expand Up @@ -228,6 +229,27 @@ class TBuffer : public TObject {
virtual TVirtualArray *PopDataCache();
virtual void PushDataCache(TVirtualArray *);

TClass *ReadClass(const TClass *cl, UInt_t *objTag)
R__DEPRECATED(6, 42, "Use the overload with ULong64_t* for objTag instead")
{
if (objTag) {
ULong64_t objTag64 = 0;

auto result = ReadClass(cl, &objTag64);
if (objTag64 > std::numeric_limits<UInt_t>::max()) {
Error("ReadClass",
"Object tag value %llu exceeds maximum of %u for 32-bit tag. Consider using the overload with "
"ULong64_t* for objTag instead.",
objTag64, std::numeric_limits<UInt_t>::max());
return result;
}
*objTag = static_cast<UInt_t>(objTag64);
return result;
} else {
return ReadClass(cl, static_cast<ULong64_t *>(nullptr));
}
}

virtual TClass *ReadClass(const TClass *cl = nullptr, ULong64_t *objTag = nullptr) = 0;
virtual void WriteClass(const TClass *cl) = 0;

Expand Down
Loading