Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
67d2d49
Remove never used enum (TRef::kNotComputed)
pcanal Aug 29, 2017
f7b63a2
Remove enum TClonesArray::kNoSplit not used since 2.26 (circa 2001)
pcanal Aug 29, 2017
e9c82a3
Update release notes
pcanal Aug 29, 2017
9a9d54f
Mark status bits as 'enum EStatusBits' in core, i/o, tree and hist.
pcanal Aug 29, 2017
4b8053e
Remove never used enum constant TLink::kObjIsParent
pcanal Aug 29, 2017
18c9cb5
Change value of TBranchObject::kWarn. Reset it upon reading.
pcanal Aug 29, 2017
8084146
Change value of TLeafObject::kWarn. Reset it upon reading.
pcanal Aug 29, 2017
20d96bb
Change value of TApplicationRemote::kCollecting.
pcanal Aug 29, 2017
1bc4ff7
Remove information duplication
pcanal Aug 29, 2017
87a10fc
Mark TObject::kObjInCanvas as deprecated
pcanal Aug 29, 2017
71f2c55
Add comments on status bits that are not available to TObject (even-t…
pcanal Aug 29, 2017
e2bf336
Update value of TClonesArray::kForgetBits.
pcanal Aug 30, 2017
67609c6
Introduce EStatusBitsDupExceptions in TStreamerElement and TVirtualSt…
pcanal Aug 30, 2017
f2ebec4
Introduce TStatusBitsChecker to avoid Status Bits overlap.
pcanal Aug 31, 2017
127c729
In ConvertToBit replace log2,nearbyint with std::frexp.
pcanal Aug 31, 2017
ae8a0ce
White spaces [NFC]
pcanal Aug 31, 2017
f2da26f
Typo [NFC]
pcanal Sep 1, 2017
3f043a6
Add TSystem::LoadAllLibs
pcanal Sep 1, 2017
28b43f6
Change value of TProofServ::kHighMemory and TVirtualProofPlayer::kIsS…
pcanal Sep 1, 2017
3fa653f
Add TStatusBitsChecker.cxx gtest
pcanal Sep 1, 2017
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
Prev Previous commit
Next Next commit
White spaces [NFC]
  • Loading branch information
pcanal committed Sep 1, 2017
commit ae8a0ce16e4aaf6964295cd11cb4d263cf56e233
4 changes: 2 additions & 2 deletions core/base/inc/TApplication.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ class TApplication : public TObject, public TQObject {
public:
// TApplication specific bits
enum EStatusBits {
kProcessRemotely = BIT(15), // TRUE if this line has to be processed remotely
kDefaultApplication = BIT(16) // TRUE if created via CreateApplication()
kProcessRemotely = BIT(15), // TRUE if this line has to be processed remotely
kDefaultApplication = BIT(16) // TRUE if created via CreateApplication()
};
// TApplication specific bits for fFiles
enum EFileBits {
Expand Down
2 changes: 1 addition & 1 deletion core/meta/inc/TStreamerElement.h
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ class TStreamerElement : public TNamed {
// we can not change its value without breaking forward compatibility.
// Furthermore, TObject::kInvalidObject and its semantic is not (and should not be)
// used in TStreamerElement
kDoNotDelete = TStreamerElement::kDoNotDelete,
kDoNotDelete = TStreamerElement::kDoNotDelete,

// This bit duplicates TObject::kCannotPick. As the semantic of kHasRange is a persistent,
// we can not change its value without breaking forward compatibility.
Expand Down
24 changes: 12 additions & 12 deletions core/meta/inc/TVirtualStreamerInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -63,21 +63,21 @@ class TVirtualStreamerInfo : public TNamed {

//status bits
enum EStatusBits {
kCannotOptimize = BIT(12),
kIgnoreTObjectStreamer = BIT(13), // eventhough BIT(13) is taken up by TObject (to preserve forward compatibility)
kRecovered = BIT(14),
kNeedCheck = BIT(15),
kIsCompiled = BIT(16),
kBuildOldUsed = BIT(17),
kBuildRunning = BIT(18)
kCannotOptimize = BIT(12),
kIgnoreTObjectStreamer = BIT(13), // eventhough BIT(13) is taken up by TObject (to preserve forward compatibility)
kRecovered = BIT(14),
kNeedCheck = BIT(15),
kIsCompiled = BIT(16),
kBuildOldUsed = BIT(17),
kBuildRunning = BIT(18)
};

enum class EStatusBitsDupExceptions {
// This bit duplicates TObject::kInvalidObject. As the semantic of kIgnoreTObjectStreamer is a persistent,
// we can not change its value without breaking forward compatibility.
// Furthermore, TObject::kInvalidObject and its semantic is not (and should not be)
// used in TVirtualStreamerInfo
kIgnoreTObjectStreamer = TVirtualStreamerInfo::kIgnoreTObjectStreamer,
// This bit duplicates TObject::kInvalidObject. As the semantic of kIgnoreTObjectStreamer is a persistent,
// we can not change its value without breaking forward compatibility.
// Furthermore, TObject::kInvalidObject and its semantic is not (and should not be)
// used in TVirtualStreamerInfo
kIgnoreTObjectStreamer = TVirtualStreamerInfo::kIgnoreTObjectStreamer,
};

enum EReadWrite {
Expand Down
2 changes: 1 addition & 1 deletion graf2d/graf/inc/TLink.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class TLink : public TText {
void *fLink; ///< pointer to object

public:
enum EStatusBits { kIsStarStar = BIT(2)};
enum EStatusBits { kIsStarStar = BIT(2) };
TLink();
TLink(Double_t x, Double_t y, void *pointer);
virtual ~TLink();
Expand Down
30 changes: 15 additions & 15 deletions hist/hist/inc/TAxis.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,21 +55,21 @@ class TAxis : public TNamed, public TAttAxis {
public:
// TAxis status bits
enum EStatusBits {
kDecimals = BIT(7),
kTickPlus = BIT(9),
kTickMinus = BIT(10),
kAxisRange = BIT(11),
kCenterTitle = BIT(12),
kCenterLabels = BIT(14), //bit 13 is used by TObject
kRotateTitle = BIT(15),
kPalette = BIT(16),
kNoExponent = BIT(17),
kLabelsHori = BIT(18),
kLabelsVert = BIT(19),
kLabelsDown = BIT(20),
kLabelsUp = BIT(21),
kIsInteger = BIT(22),
kMoreLogLabels = BIT(23)
kDecimals = BIT(7),
kTickPlus = BIT(9),
kTickMinus = BIT(10),
kAxisRange = BIT(11),
kCenterTitle = BIT(12),
kCenterLabels = BIT(14), //bit 13 is used by TObject
kRotateTitle = BIT(15),
kPalette = BIT(16),
kNoExponent = BIT(17),
kLabelsHori = BIT(18),
kLabelsVert = BIT(19),
kLabelsDown = BIT(20),
kLabelsUp = BIT(21),
kIsInteger = BIT(22),
kMoreLogLabels = BIT(23)
};

TAxis();
Expand Down
10 changes: 5 additions & 5 deletions hist/hist/inc/TEfficiency.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@ class TEfficiency: public TNamed, public TAttLine, public TAttFill, public TAttM
Double_t fWeight; //weight for all events (default = 1)

enum EStatusBits {
kIsBayesian = BIT(14), //bayesian statistics are used
kPosteriorMode = BIT(15), //use posterior mean for best estimate (Bayesian statistics)
kShortestInterval = BIT(16), // use shortest interval
kUseBinPrior = BIT(17), // use a different prior for each bin
kUseWeights = BIT(18) // use weights
kIsBayesian = BIT(14), //bayesian statistics are used
kPosteriorMode = BIT(15), //use posterior mean for best estimate (Bayesian statistics)
kShortestInterval = BIT(16), // use shortest interval
kUseBinPrior = BIT(17), // use a different prior for each bin
kUseWeights = BIT(18) // use weights
};

void Build(const char* name,const char* title);
Expand Down
2 changes: 1 addition & 1 deletion hist/histpainter/inc/TPaletteAxis.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class TPaletteAxis : public TPave {

public:
// TPaletteAxis status bits
enum EStatusBits { kHasView = BIT(11) };
enum EStatusBits { kHasView = BIT(11) };

TPaletteAxis();
TPaletteAxis(Double_t x1, Double_t y1,Double_t x2 ,Double_t y2, TH1 *h);
Expand Down
7 changes: 5 additions & 2 deletions io/io/inc/TBufferFile.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,12 @@ class TBufferFile : public TBuffer {
enum { kMapSize = 503 };
enum { kStreamedMemberWise = BIT(14) }; //added to version number to know if a collection has been stored member-wise
enum EStatusBits {
kNotDecompressed = BIT(15), //indicates a weird buffer, used by TBasket
kNotDecompressed = BIT(15), //indicates a weird buffer, used by TBasket
kTextBasedStreaming = BIT(18), //indicates if buffer used for XML/SQL object streaming
kUser1 = BIT(21), kUser2 = BIT(22), kUser3 = BIT(23) //free for user

kUser1 = BIT(21), //free for user
kUser2 = BIT(22), //free for user
kUser3 = BIT(23) //free for user
};

TBufferFile(TBuffer::EMode mode);
Expand Down
44 changes: 22 additions & 22 deletions io/io/inc/TStreamerInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -138,28 +138,28 @@ class TStreamerInfo : public TVirtualStreamerInfo {
/// Status bits
/// See TVirtualStreamerInfo::EStatusBits for the values.

/// EReadWrite Enumerator
/// | Enum Constant | Description |
/// |----------|--------------------|
/// | kBase | Base class element |
/// | kOffsetL | Fixed size array |
/// | kOffsetP | Pointer to object |
/// | kCounter | Counter for array size |
/// | kCharStar| Pointer to array of char |
/// | kLegacyChar | Equal to TDataType's kchar |
/// | kBits | TObject::fBits in case of a referenced object |
/// | kObject | Class derived from TObject, or for TStreamerSTL::fCtype non-pointer elements |
/// | kObjectp | Class* derived from TObject and with comment field //->Class, or for TStreamerSTL::fCtype: pointer elements |
/// | kObjectP | Class* derived from TObject and with NO comment field //->Class |
/// | kAny | Class not derived from TObject |
/// | kAnyp | Class* not derived from TObject with comment field //->Class |
/// | kAnyP | Class* not derived from TObject with NO comment field //->Class |
/// | kAnyPnoVT | Class* not derived from TObject with NO comment field //->Class and Class has NO virtual table |
/// | kSTLp | Pointer to STL container |
/// | kTString | TString, special case |
/// | kTObject | TObject, special case |
/// | kTNamed | TNamed , special case |
/// | kCache | Cache the value in memory than is not part of the object but is accessible via a SchemaRule |
/// EReadWrite Enumerator
/// | Enum Constant | Description |
/// |-------------|--------------------|
/// | kBase | Base class element |
/// | kOffsetL | Fixed size array |
/// | kOffsetP | Pointer to object |
/// | kCounter | Counter for array size |
/// | kCharStar | Pointer to array of char |
/// | kLegacyChar | Equal to TDataType's kchar |
/// | kBits | TObject::fBits in case of a referenced object |
/// | kObject | Class derived from TObject, or for TStreamerSTL::fCtype non-pointer elements |
/// | kObjectp | Class* derived from TObject and with comment field //->Class, or for TStreamerSTL::fCtype: pointer elements |
/// | kObjectP | Class* derived from TObject and with NO comment field //->Class |
/// | kAny | Class not derived from TObject |
/// | kAnyp | Class* not derived from TObject with comment field //->Class |
/// | kAnyP | Class* not derived from TObject with NO comment field //->Class |
/// | kAnyPnoVT | Class* not derived from TObject with NO comment field //->Class and Class has NO virtual table |
/// | kSTLp | Pointer to STL container |
/// | kTString | TString, special case |
/// | kTObject | TObject, special case |
/// | kTNamed | TNamed , special case |
/// | kCache | Cache the value in memory than is not part of the object but is accessible via a SchemaRule |
enum EReadWrite {
kBase = 0, kOffsetL = 20, kOffsetP = 40, kCounter = 6, kCharStar = 7,
kChar = 1, kShort = 2, kInt = 3, kLong = 4, kFloat = 5,
Expand Down
8 changes: 4 additions & 4 deletions net/net/inc/TApplicationRemote.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ class TApplicationRemote : public TApplication {

public:
enum ESendFileOpt {
kAscii = 0x0,
kBinary = 0x1,
kForce = 0x2
kAscii = 0x0,
kBinary = 0x1,
kForce = 0x2
};
// TApplication specific bits
enum EStatusBits {
kCollecting = BIT(17) // TRUE while collecting from server
kCollecting = BIT(17) // TRUE while collecting from server
};

private:
Expand Down
6 changes: 3 additions & 3 deletions tree/tree/inc/TBranch.h
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,12 @@ class TBranch : public TNamed , public TAttFill {
// TBranch status bits
enum EStatusBits {
kDoNotProcess = ::kDoNotProcess, // Active bit for branches
kIsClone = ::kIsClone, // to indicate a TBranchClones
kIsClone = ::kIsClone, // to indicate a TBranchClones
kBranchObject = ::kBranchObject, // branch is a TObject*
kBranchAny = ::kBranchAny, // branch is an object*
kBranchAny = ::kBranchAny, // branch is an object*
// kMapObject = kBranchObject | kBranchAny;
kAutoDelete = BIT(15),

kAutoDelete = BIT(15),
kDoNotUseBufferMap = BIT(22) // If set, at least one of the entry in the branch will use the buffer's map of classname and objects.
};

Expand Down
14 changes: 7 additions & 7 deletions tree/tree/inc/TBranchElement.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@ class TBranchElement : public TBranch {
// Types
protected:
enum EStatusBits {
kBranchFolder = BIT(14),
kDeleteObject = BIT(16), ///< We are the owner of fObject.
kCache = BIT(18), ///< Need to pushd/pop fOnfileObject.
kOwnOnfileObj = BIT(19), ///< We are the owner of fOnfileObject.
kAddressSet = BIT(20), ///< The addressing set have been called for this branch
kMakeClass = BIT(21), ///< This branch has been switched to using the MakeClass Mode
kDecomposedObj= BIT(21) ///< More explicit alias for kMakeClass.
kBranchFolder = BIT(14),
kDeleteObject = BIT(16), ///< We are the owner of fObject.
kCache = BIT(18), ///< Need to pushd/pop fOnfileObject.
kOwnOnfileObj = BIT(19), ///< We are the owner of fOnfileObject.
kAddressSet = BIT(20), ///< The addressing set have been called for this branch
kMakeClass = BIT(21), ///< This branch has been switched to using the MakeClass Mode
kDecomposedObj = BIT(21) ///< More explicit alias for kMakeClass.
};

// Note on fType values:
Expand Down
14 changes: 7 additions & 7 deletions tree/treeviewer/inc/TParallelCoord.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ class TSelectorDraw;
class TParallelCoord : public TNamed {
public:
enum EStatusBits {
kVertDisplay =BIT(14), // If the axes are drawn vertically, false if horizontally.
kCurveDisplay =BIT(15), // If the polylines are replaced by interpolated curves.
kPaintEntries =BIT(16), // To prentry the TParallelCoord to paint all the entries.
kLiveUpdate =BIT(17), // To paint the entries when being modified.
kGlobalScale =BIT(19), // Every variable is on the same scale.
kCandleChart =BIT(20), // To produce a candle chart.
kGlobalLogScale =BIT(21) // Every variable in log scale.
kVertDisplay = BIT(14), // If the axes are drawn vertically, false if horizontally.
kCurveDisplay = BIT(15), // If the polylines are replaced by interpolated curves.
kPaintEntries = BIT(16), // To prentry the TParallelCoord to paint all the entries.
kLiveUpdate = BIT(17), // To paint the entries when being modified.
kGlobalScale = BIT(19), // Every variable is on the same scale.
kCandleChart = BIT(20), // To produce a candle chart.
kGlobalLogScale = BIT(21) // Every variable in log scale.
};

private:
Expand Down
6 changes: 3 additions & 3 deletions tree/treeviewer/inc/TParallelCoordVar.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ class TH1F;
class TParallelCoordVar : public TNamed, public TAttLine, public TAttFill {
public:
enum EStatusBits {
kLogScale =BIT(14),
kShowBox =BIT(15),
kShowBarHisto =BIT(16)
kLogScale = BIT(14),
kShowBox = BIT(15),
kShowBarHisto = BIT(16)
};
private:
Int_t fNbins; // Number of bins in fHistogram.
Expand Down