Skip to content

Commit

Permalink
Fix Clang -Winconsistent-missing-override warnings
Browse files Browse the repository at this point in the history
Example warning:

In file included from .../XrdXrootdAioTask.cc:42:
src/XrdXrootd/XrdXrootdAioBuff.hh:51:25:
  warning: 'Recycle' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
virtual void            Recycle();
                        ^
src/XrdSfs/XrdSfsAio.hh:79:14: note: overridden virtual function is here
virtual void Recycle() = 0;
  • Loading branch information
amadio committed Apr 13, 2023
1 parent 60db113 commit c074b8c
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion src/XrdMacaroons/XrdMacaroonsAuthz.hh
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public:

// Macaroons don't have a concept off an "issuers"; return an empty
// list.
virtual Issuers IssuerList() {return Issuers();}
virtual Issuers IssuerList() override {return Issuers();}

private:
XrdAccPrivs OnMissing(const XrdSecEntity *Entity,
Expand Down
2 changes: 1 addition & 1 deletion src/XrdPosix/XrdPosixFile.hh
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ inline void UpdtSize(size_t newsz)

using XrdPosixObject::Who;

inline bool Who(XrdPosixFile **fileP)
inline bool Who(XrdPosixFile **fileP) override
{*fileP = this; return true;}

int Write(char *Buff, long long Offs, int Len) override;
Expand Down
34 changes: 17 additions & 17 deletions src/XrdPss/XrdPss.hh
Original file line number Diff line number Diff line change
Expand Up @@ -144,34 +144,34 @@ struct XrdVersionInfo;
class XrdPssSys : public XrdOss
{
public:
virtual XrdOssDF *newDir(const char *tident)
virtual XrdOssDF *newDir(const char *tident) override
{return (XrdOssDF *)new XrdPssDir(tident);}
virtual XrdOssDF *newFile(const char *tident)
virtual XrdOssDF *newFile(const char *tident) override
{return (XrdOssDF *)new XrdPssFile(tident);}

virtual void Connect(XrdOucEnv &);
virtual void Connect(XrdOucEnv &) override;

virtual void Disc(XrdOucEnv &);
virtual void Disc(XrdOucEnv &) override;

int Chmod(const char *, mode_t mode, XrdOucEnv *eP=0);
int Chmod(const char *, mode_t mode, XrdOucEnv *eP=0) override;
bool ConfigMapID();
virtual
int Create(const char *, const char *, mode_t, XrdOucEnv &, int opts=0);
void EnvInfo(XrdOucEnv *envP);
uint64_t Features() {return myFeatures;}
int Create(const char *, const char *, mode_t, XrdOucEnv &, int opts=0) override;
void EnvInfo(XrdOucEnv *envP) override;
uint64_t Features() override {return myFeatures;}
int Init(XrdSysLogger *, const char *) override {return -ENOTSUP;}
int Init(XrdSysLogger *, const char *, XrdOucEnv *envP) override;
int Lfn2Pfn(const char *Path, char *buff, int blen);
int Lfn2Pfn(const char *Path, char *buff, int blen) override;
const
char *Lfn2Pfn(const char *Path, char *buff, int blen, int &rc);
int Mkdir(const char *, mode_t mode, int mkpath=0, XrdOucEnv *eP=0);
int Remdir(const char *, int Opts=0, XrdOucEnv *eP=0);
char *Lfn2Pfn(const char *Path, char *buff, int blen, int &rc) override;
int Mkdir(const char *, mode_t mode, int mkpath=0, XrdOucEnv *eP=0) override;
int Remdir(const char *, int Opts=0, XrdOucEnv *eP=0) override;
int Rename(const char *, const char *,
XrdOucEnv *eP1=0, XrdOucEnv *eP2=0);
int Stat(const char *, struct stat *, int opts=0, XrdOucEnv *eP=0);
int Stats(char *bp, int bl);
int Truncate(const char *, unsigned long long, XrdOucEnv *eP=0);
int Unlink(const char *, int Opts=0, XrdOucEnv *eP=0);
XrdOucEnv *eP1=0, XrdOucEnv *eP2=0) override;
int Stat(const char *, struct stat *, int opts=0, XrdOucEnv *eP=0) override;
int Stats(char *bp, int bl) override;
int Truncate(const char *, unsigned long long, XrdOucEnv *eP=0) override;
int Unlink(const char *, int Opts=0, XrdOucEnv *eP=0) override;

static const int PolNum = 2;
enum PolAct {PolPath = 0, PolObj = 1};
Expand Down
2 changes: 1 addition & 1 deletion src/XrdXrootd/XrdXrootdAioBuff.hh
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ XrdXrootdAioBuff* Alloc(XrdXrootdAioTask *arp);

void doneWrite() override;

virtual void Recycle();
virtual void Recycle() override;

XrdXrootdAioBuff* next;

Expand Down
20 changes: 10 additions & 10 deletions src/XrdXrootd/XrdXrootdProtocol.hh
Original file line number Diff line number Diff line change
Expand Up @@ -163,11 +163,11 @@ public:

static char *Buffer(XrdSfsXioHandle h, int *bsz); // XrdSfsXio

XrdSfsXioHandle Claim(const char *buff, int datasz, int minasz=0);// XrdSfsXio
XrdSfsXioHandle Claim(const char *buff, int datasz, int minasz=0) override;// XrdSfsXio

static int Configure(char *parms, XrdProtocol_Config *pi);

void DoIt() {(*this.*Resume)();}
void DoIt() override {(*this.*Resume)();}

int do_WriteSpan();

Expand All @@ -181,29 +181,29 @@ static int Configure(char *parms, XrdProtocol_Config *pi);

int getPathID() {return PathID;}

XrdProtocol *Match(XrdLink *lp);
XrdProtocol *Match(XrdLink *lp) override;

int Process(XrdLink *lp); // Sync: Job->Link.DoIt->Process
int Process(XrdLink *lp) override; // Sync: Job->Link.DoIt->Process

int Process2();

int ProcSig();

void Recycle(XrdLink *lp, int consec, const char *reason);
void Recycle(XrdLink *lp, int consec, const char *reason) override;

static void Reclaim(XrdSfsXioHandle h); // XrdSfsXio

int SendFile(int fildes); // XrdSfsDio
int SendFile(int fildes) override; // XrdSfsDio

int SendFile(XrdOucSFVec *sfvec, int sfvnum); // XrdSfsDio
int SendFile(XrdOucSFVec *sfvec, int sfvnum) override; // XrdSfsDio

void SetFD(int fildes); // XrdSfsDio
void SetFD(int fildes) override; // XrdSfsDio

int Stats(char *buff, int blen, int do_sync=0);
int Stats(char *buff, int blen, int do_sync=0) override;

void StreamNOP();

XrdSfsXioHandle Swap(const char *buff, XrdSfsXioHandle h=0); // XrdSfsXio
XrdSfsXioHandle Swap(const char *buff, XrdSfsXioHandle h=0) override; // XrdSfsXio

XrdXrootdProtocol *VerifyStream(int &rc, int pID, bool lok=true);

Expand Down

0 comments on commit c074b8c

Please sign in to comment.