[linux-port] Mark all overridden methods (#1319)

Clang produces a warning when a method that overrides another is
not marked with the override keyword. Adding the keyword has no
effect on overridden functions, but it is good practice to mark
all methods intended to override as such because if they fail to
do so, the keyword will produce an error.

Fixes 78 Clang warnings.
This commit is contained in:
Greg Roth 2018-05-30 07:07:16 -06:00 коммит произвёл Ehsan
Родитель df8f1cb289
Коммит 5267dff556
12 изменённых файлов: 25 добавлений и 25 удалений

Просмотреть файл

@ -24,7 +24,7 @@ private:
ULONG cbWritten;
IFT(m_pStream->Write(Ptr, Size, &cbWritten));
}
uint64_t current_pos() const { return m_pStream->GetPosition(); }
uint64_t current_pos() const override { return m_pStream->GetPosition(); }
public:
raw_stream_ostream(hlsl::AbstractMemoryStream* pStream) : m_pStream(pStream) { }
~raw_stream_ostream() override {
@ -51,7 +51,7 @@ public:
CComPtr<IDxcBlob> m_result;
CComPtr<IDxcBlobEncoding> m_errors;
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **ppvObject) {
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **ppvObject) override {
return DoBasicQueryInterface<IDxcOperationResult>(this, iid, ppvObject);
}

Просмотреть файл

@ -77,12 +77,12 @@ public:
#define DXC_MICROCOM_REF_FIELD(m_dwRef) volatile llvm::sys::cas_flag m_dwRef = 0;
#define DXC_MICROCOM_ADDREF_IMPL(m_dwRef) \
ULONG STDMETHODCALLTYPE AddRef() {\
ULONG STDMETHODCALLTYPE AddRef() override {\
return (ULONG)llvm::sys::AtomicIncrement(&m_dwRef); \
}
#define DXC_MICROCOM_ADDREF_RELEASE_IMPL(m_dwRef) \
DXC_MICROCOM_ADDREF_IMPL(m_dwRef) \
ULONG STDMETHODCALLTYPE Release() { \
ULONG STDMETHODCALLTYPE Release() override { \
ULONG result = (ULONG)llvm::sys::AtomicDecrement(&m_dwRef); \
if (result == 0) delete this; \
return result; \
@ -109,7 +109,7 @@ void DxcCallDestructor(T *obj) {
#define DXC_MICROCOM_TM_ADDREF_RELEASE_IMPL() \
DXC_MICROCOM_ADDREF_IMPL(m_dwRef) \
ULONG STDMETHODCALLTYPE Release() { \
ULONG STDMETHODCALLTYPE Release() override { \
ULONG result = (ULONG)llvm::sys::AtomicDecrement(&m_dwRef); \
if (result == 0) { \
CComPtr<IMalloc> pTmp(m_pMalloc); \

Просмотреть файл

@ -30,7 +30,7 @@ public:
ULONG STDMETHODCALLTYPE Release() {
return 1;
}
STDMETHODIMP QueryInterface(REFIID iid, void** ppvObject) {
STDMETHODIMP QueryInterface(REFIID iid, void** ppvObject) override {
return DoBasicQueryInterface<IMalloc>(this, iid, ppvObject);
}
virtual void *STDMETHODCALLTYPE Alloc(
@ -183,7 +183,7 @@ private:
UINT32 m_CodePage;
public:
DXC_MICROCOM_ADDREF_IMPL(m_dwRef)
ULONG STDMETHODCALLTYPE Release() {
ULONG STDMETHODCALLTYPE Release() override {
// Because blobs are also used by tests and utilities, we avoid using TLS.
ULONG result = (ULONG)llvm::sys::AtomicDecrement(&m_dwRef);
if (result == 0) {
@ -194,7 +194,7 @@ public:
return result;
}
DXC_MICROCOM_TM_CTOR(InternalDxcBlobEncoding)
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **ppvObject) {
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **ppvObject) override {
return DoBasicQueryInterface<IDxcBlob, IDxcBlobEncoding>(this, iid, ppvObject);
}
@ -265,7 +265,7 @@ public:
virtual SIZE_T STDMETHODCALLTYPE GetBufferSize(void) override {
return m_BufferSize;
}
virtual HRESULT STDMETHODCALLTYPE GetEncoding(_Out_ BOOL *pKnown, _Out_ UINT32 *pCodePage) {
virtual HRESULT STDMETHODCALLTYPE GetEncoding(_Out_ BOOL *pKnown, _Out_ UINT32 *pCodePage) override {
*pKnown = m_EncodingKnown ? TRUE : FALSE;
*pCodePage = m_CodePage;
return S_OK;
@ -774,7 +774,7 @@ private:
ULONG m_allocSize = 0;
public:
DXC_MICROCOM_ADDREF_IMPL(m_dwRef)
ULONG STDMETHODCALLTYPE Release() {
ULONG STDMETHODCALLTYPE Release() override {
// Because memory streams are also used by tests and utilities,
// we avoid using TLS.
ULONG result = (ULONG)llvm::sys::AtomicDecrement(&m_dwRef);
@ -788,7 +788,7 @@ public:
DXC_MICROCOM_TM_CTOR(MemoryStream)
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **ppvObject) {
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **ppvObject) override {
return DoBasicQueryInterface<IStream, ISequentialStream, IDxcBlob>(this, iid, ppvObject);
}
@ -992,7 +992,7 @@ public:
DXC_MICROCOM_TM_ADDREF_RELEASE_IMPL()
DXC_MICROCOM_TM_CTOR(ReadOnlyBlobStream)
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **ppvObject) {
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **ppvObject) override {
return DoBasicQueryInterface<IStream, ISequentialStream>(this, iid, ppvObject);
}

Просмотреть файл

@ -433,7 +433,7 @@ public:
DXC_MICROCOM_TM_ADDREF_RELEASE_IMPL()
DXC_MICROCOM_TM_CTOR(DxcOptimizerPass)
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **ppvObject) {
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **ppvObject) override {
return DoBasicQueryInterface<IDxcOptimizerPass>(this, iid, ppvObject);
}
@ -489,7 +489,7 @@ public:
DXC_MICROCOM_TM_ADDREF_RELEASE_IMPL()
DXC_MICROCOM_TM_CTOR(DxcOptimizer)
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **ppvObject) {
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **ppvObject) override {
return DoBasicQueryInterface<IDxcOptimizer>(this, iid, ppvObject);
}

Просмотреть файл

@ -212,7 +212,7 @@ private:
llvm::Type *Ty);
void EmitHLSLRootSignature(CodeGenFunction &CGF, HLSLRootSignatureAttr *RSA,
llvm::Function *Fn);
llvm::Function *Fn) override;
void CheckParameterAnnotation(SourceLocation SLoc,
const DxilParameterAnnotation &paramInfo,

Просмотреть файл

@ -569,7 +569,7 @@ public:
DxcIncludeHandlerForInjectedSources() : m_dwRef(0) {};
std::unordered_map<std::wstring, CComPtr<IDxcBlob>> includeFiles;
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **ppvObject) {
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **ppvObject) override {
return DoBasicQueryInterface<IDxcIncludeHandler>(this, iid, ppvObject);
}

Просмотреть файл

@ -39,7 +39,7 @@ public:
DXC_MICROCOM_TM_ADDREF_RELEASE_IMPL()
DXC_MICROCOM_TM_CTOR(DxcAssembler)
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **ppvObject) {
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **ppvObject) override {
return DoBasicQueryInterface<IDxcAssembler>(this, iid, ppvObject);
}

Просмотреть файл

@ -30,7 +30,7 @@ public:
DXC_MICROCOM_TM_ADDREF_RELEASE_IMPL()
DXC_MICROCOM_TM_CTOR(DxcIncludeHandlerForFS)
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **ppvObject) {
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **ppvObject) override {
return DoBasicQueryInterface<IDxcIncludeHandler>(this, iid, ppvObject);
}
@ -54,7 +54,7 @@ public:
DXC_MICROCOM_TM_ADDREF_RELEASE_IMPL()
DXC_MICROCOM_TM_CTOR(DxcLibrary)
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **ppvObject) {
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **ppvObject) override {
return DoBasicQueryInterface<IDxcLibrary>(this, iid, ppvObject);
}

Просмотреть файл

@ -175,7 +175,7 @@ public:
return false;
}
virtual HLSLExtensionsCodegenHelper::CustomRootSignature::Status GetCustomRootSignature(CustomRootSignature *out) {
virtual HLSLExtensionsCodegenHelper::CustomRootSignature::Status GetCustomRootSignature(CustomRootSignature *out) override {
// Find macro definition in preprocessor.
Preprocessor &pp = m_CI.getPreprocessor();
MacroInfo *macro = MacroExpander::FindMacroInfo(pp, m_rootSigDefine);
@ -253,7 +253,7 @@ public:
return S_OK;
}
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **ppvObject) {
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **ppvObject) override {
return DoBasicQueryInterface<IDxcCompiler,
IDxcCompiler2,
IDxcLangExtensions,

Просмотреть файл

@ -36,7 +36,7 @@ public:
DXC_MICROCOM_TM_ADDREF_RELEASE_IMPL()
DXC_MICROCOM_TM_CTOR(DxcContainerBuilder)
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void **ppvObject) {
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void **ppvObject) override {
return DoBasicQueryInterface<IDxcContainerBuilder>(this, riid, ppvObject);
}
@ -252,4 +252,4 @@ HRESULT CreateDxcContainerBuilder(_In_ REFIID riid, _Out_ LPVOID *ppv) {
IFROOM(Result.p);
Result->Init(warning);
return Result->QueryInterface(riid, ppv);
}
}

Просмотреть файл

@ -65,7 +65,7 @@ public:
DXC_MICROCOM_TM_ADDREF_RELEASE_IMPL()
DXC_MICROCOM_TM_CTOR(DxcValidator)
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **ppvObject) {
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **ppvObject) override {
return DoBasicQueryInterface<IDxcValidator, IDxcVersionInfo>(this, iid, ppvObject);
}

Просмотреть файл

@ -547,7 +547,7 @@ public:
DXC_MICROCOM_TM_CTOR(DxcRewriter)
DXC_LANGEXTENSIONS_HELPER_IMPL(m_langExtensionsHelper)
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **ppvObject) {
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **ppvObject) override {
return DoBasicQueryInterface<IDxcRewriter, IDxcLangExtensions>(this, iid, ppvObject);
}