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
8 changes: 4 additions & 4 deletions graf2d/cocoa/inc/TGCocoa.h
Original file line number Diff line number Diff line change
Expand Up @@ -468,10 +468,10 @@ class TGCocoa : public TVirtualX {
public:
static Atom_t fgDeleteWindowAtom;

private:
//TODO: use instead = delete syntax from C++0x11
TGCocoa(const TGCocoa &rhs);
TGCocoa &operator = (const TGCocoa &rhs);
TGCocoa(const TGCocoa &rhs) = delete;
TGCocoa &operator = (const TGCocoa &rhs) = delete;
TGCocoa(TGCocoa &&rhs) = delete;
TGCocoa &operator = (TGCocoa &&rhs) = delete;

ClassDefOverride(TGCocoa, 0); //TVirtualX for MacOS X.
};
Expand Down
1 change: 0 additions & 1 deletion graf2d/cocoa/inc/TGQuartz.h
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ class TGQuartz : public TGCocoa {
void AlignTTFString();
Bool_t IsTTFStringVisible(Int_t x, Int_t y, UInt_t w, UInt_t h);
void RenderTTFString(Int_t x, Int_t y, ETextMode mode);
//TODO: move internal headers like TGQuartz.h out of the public ROOT user interface. Then we can also use XQuartz types like QuartzPixmap* instead of void * in functions like these
void DrawFTGlyphIntoPixmap(void *pixmap, FT_Bitmap *source, ULong_t fore, ULong_t back, Int_t bx, Int_t by);

void SetAA();
Expand Down
7 changes: 3 additions & 4 deletions io/io/inc/TMapFile.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,17 +73,16 @@ friend class TMapRec;

static void *MapToAddress();

public:
enum { kDefaultMapSize = 0x80000 }; // default size of mapped heap is 500 KB

// TODO: Should both be protected
~TMapFile() override;
void *operator new(size_t sz) { return TObject::operator new(sz); }
void *operator new[](size_t sz) { return TObject::operator new[](sz); }
void *operator new(size_t sz, void *vp) { return TObject::operator new(sz, vp); }
void *operator new[](size_t sz, void *vp) { return TObject::operator new[](sz, vp); }
void operator delete(void *vp);

public:
enum { kDefaultMapSize = 0x80000 }; // default size of mapped heap is 500 KB

void Browse(TBrowser *b) override;
void Close(Option_t *option = "") override;
void *GetBaseAddr() const { return (void *)fBaseAddr; }
Expand Down
3 changes: 0 additions & 3 deletions tmva/tmva/inc/TMVA/MethodCuts.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,6 @@ namespace TMVA {
MethodCuts( DataSetInfo& theData,
const TString& theWeightFile);

// TODO: remove this is a workaround which was necessary when CINT was not capable of handling dynamic casts
static MethodCuts* DynamicCast( IMethod* method ) { return dynamic_cast<MethodCuts*>(method); }

virtual ~MethodCuts( void );

Bool_t HasAnalysisType( Types::EAnalysisType type, UInt_t numberClasses, UInt_t numberTargets ) override;
Expand Down
Loading