diff options
author | MichaĆ Janiszewski <janisozaur@users.noreply.github.com> | 2018-10-31 21:30:48 +0100 |
---|---|---|
committer | Jan Kotas <jkotas@microsoft.com> | 2018-10-31 13:30:48 -0700 |
commit | a374692390570b3efe4d4b4fe8894fd9c0b34d0f (patch) | |
tree | b4a530cb3c931c0066df13aaf0cc5a44e92f898b /src/vm | |
parent | b042303bf1139472854accc8fe444f4ed442da23 (diff) | |
download | coreclr-a374692390570b3efe4d4b4fe8894fd9c0b34d0f.tar.gz coreclr-a374692390570b3efe4d4b4fe8894fd9c0b34d0f.tar.bz2 coreclr-a374692390570b3efe4d4b4fe8894fd9c0b34d0f.zip |
Remove superfluous 'const' qualifier from trivial return types (#20652)
The 'const' used in this context has no meaning
Diffstat (limited to 'src/vm')
-rw-r--r-- | src/vm/amd64/virtualcallstubcpu.hpp | 2 | ||||
-rw-r--r-- | src/vm/appdomain.hpp | 4 | ||||
-rw-r--r-- | src/vm/ceeload.h | 2 | ||||
-rw-r--r-- | src/vm/codeversion.h | 4 | ||||
-rw-r--r-- | src/vm/dataimage.cpp | 2 | ||||
-rw-r--r-- | src/vm/eedbginterface.h | 2 | ||||
-rw-r--r-- | src/vm/eedbginterfaceimpl.cpp | 2 | ||||
-rw-r--r-- | src/vm/eedbginterfaceimpl.h | 2 | ||||
-rw-r--r-- | src/vm/eventtrace.cpp | 2 | ||||
-rw-r--r-- | src/vm/frames.h | 2 | ||||
-rw-r--r-- | src/vm/ibclogger.h | 4 | ||||
-rw-r--r-- | src/vm/peimage.h | 28 | ||||
-rw-r--r-- | src/vm/peimage.inl | 30 |
13 files changed, 43 insertions, 43 deletions
diff --git a/src/vm/amd64/virtualcallstubcpu.hpp b/src/vm/amd64/virtualcallstubcpu.hpp index ee2e2ca719..1bfe858d5f 100644 --- a/src/vm/amd64/virtualcallstubcpu.hpp +++ b/src/vm/amd64/virtualcallstubcpu.hpp @@ -206,7 +206,7 @@ struct DispatchStub e_TYPE_LONG, }; - inline DispatchStubType const type() const + inline DispatchStubType type() const { LIMITED_METHOD_CONTRACT; CONSISTENCY_CHECK(DispatchStubShort::isShortStub(reinterpret_cast<LPCBYTE>(this + 1)) diff --git a/src/vm/appdomain.hpp b/src/vm/appdomain.hpp index 5819c340fc..73639cccea 100644 --- a/src/vm/appdomain.hpp +++ b/src/vm/appdomain.hpp @@ -3721,8 +3721,8 @@ private: return (count_t)(dac_cast<TADDR>(key)); } - static const element_t Null() { return NULL; } - static const element_t Deleted() { return (element_t)(TADDR)-1; } + static element_t Null() { return NULL; } + static element_t Deleted() { return (element_t)(TADDR)-1; } static bool IsNull(const element_t & e) { return e == NULL; } static bool IsDeleted(const element_t & e) { return dac_cast<TADDR>(e) == (TADDR)-1; } }; diff --git a/src/vm/ceeload.h b/src/vm/ceeload.h index 91da7b35ae..b421484e5a 100644 --- a/src/vm/ceeload.h +++ b/src/vm/ceeload.h @@ -986,7 +986,7 @@ public: LIMITED_METHOD_CONTRACT; return (count_t) k->Hash(); } - static const element_t Null() + static element_t Null() { LIMITED_METHOD_CONTRACT; return NULL; diff --git a/src/vm/codeversion.h b/src/vm/codeversion.h index 6dddacc69d..39b03f0454 100644 --- a/src/vm/codeversion.h +++ b/src/vm/codeversion.h @@ -487,7 +487,7 @@ public: return (count_t)(size_t)dac_cast<TADDR>(k); } - static const element_t Null() { LIMITED_METHOD_CONTRACT; return dac_cast<PTR_MethodDescVersioningState>(nullptr); } + static element_t Null() { LIMITED_METHOD_CONTRACT; return dac_cast<PTR_MethodDescVersioningState>(nullptr); } static bool IsNull(const element_t &e) { LIMITED_METHOD_CONTRACT; return e == NULL; } }; @@ -549,7 +549,7 @@ public: return (count_t)k.Hash(); } - static const element_t Null() { LIMITED_METHOD_CONTRACT; return dac_cast<PTR_ILCodeVersioningState>(nullptr); } + static element_t Null() { LIMITED_METHOD_CONTRACT; return dac_cast<PTR_ILCodeVersioningState>(nullptr); } static bool IsNull(const element_t &e) { LIMITED_METHOD_CONTRACT; return e == NULL; } }; diff --git a/src/vm/dataimage.cpp b/src/vm/dataimage.cpp index c0e737a1bb..cea29a32ed 100644 --- a/src/vm/dataimage.cpp +++ b/src/vm/dataimage.cpp @@ -111,7 +111,7 @@ public: return (count_t)k.m_dwSize ^ (count_t)k.m_kind ^ HashBytes((BYTE *)k.m_data, k.m_dwSize); } - static const element_t Null() { LIMITED_METHOD_CONTRACT; return NULL; } + static element_t Null() { LIMITED_METHOD_CONTRACT; return NULL; } static bool IsNull(const element_t &e) { LIMITED_METHOD_CONTRACT; return e == NULL; } }; diff --git a/src/vm/eedbginterface.h b/src/vm/eedbginterface.h index ee8303c981..38b43b729a 100644 --- a/src/vm/eedbginterface.h +++ b/src/vm/eedbginterface.h @@ -165,7 +165,7 @@ public: virtual size_t GetFunctionSize(MethodDesc *pFD) = 0; - virtual const PCODE GetFunctionAddress(MethodDesc *pFD) = 0; + virtual PCODE GetFunctionAddress(MethodDesc *pFD) = 0; #ifndef DACCESS_COMPILE diff --git a/src/vm/eedbginterfaceimpl.cpp b/src/vm/eedbginterfaceimpl.cpp index 9a95af1298..d00d4386f9 100644 --- a/src/vm/eedbginterfaceimpl.cpp +++ b/src/vm/eedbginterfaceimpl.cpp @@ -641,7 +641,7 @@ size_t EEDbgInterfaceImpl::GetFunctionSize(MethodDesc *pFD) } #endif //!DACCESS_COMPILE -const PCODE EEDbgInterfaceImpl::GetFunctionAddress(MethodDesc *pFD) +PCODE EEDbgInterfaceImpl::GetFunctionAddress(MethodDesc *pFD) { CONTRACTL { diff --git a/src/vm/eedbginterfaceimpl.h b/src/vm/eedbginterfaceimpl.h index 293b11d663..da05169e1f 100644 --- a/src/vm/eedbginterfaceimpl.h +++ b/src/vm/eedbginterfaceimpl.h @@ -146,7 +146,7 @@ public: size_t GetFunctionSize(MethodDesc *pFD) DAC_UNEXPECTED(); - const PCODE GetFunctionAddress(MethodDesc *pFD); + PCODE GetFunctionAddress(MethodDesc *pFD); void DisablePreemptiveGC(void); diff --git a/src/vm/eventtrace.cpp b/src/vm/eventtrace.cpp index 45de0a3e73..05fc63f098 100644 --- a/src/vm/eventtrace.cpp +++ b/src/vm/eventtrace.cpp @@ -2722,7 +2722,7 @@ public: return (e == NULL); } - static const element_t Null() + static element_t Null() { LIMITED_METHOD_CONTRACT; return NULL; diff --git a/src/vm/frames.h b/src/vm/frames.h index 5da6bcdacd..db58228657 100644 --- a/src/vm/frames.h +++ b/src/vm/frames.h @@ -487,7 +487,7 @@ public: // indicate the current X86 IP address within the current method // return 0 if the information is not available - virtual const PTR_BYTE GetIP() + virtual PTR_BYTE GetIP() { LIMITED_METHOD_CONTRACT; return NULL; diff --git a/src/vm/ibclogger.h b/src/vm/ibclogger.h index 1fc74ce5b0..58fa062ae8 100644 --- a/src/vm/ibclogger.h +++ b/src/vm/ibclogger.h @@ -191,7 +191,7 @@ public: #endif // POINTER_BITS } - static const element_t Null() + static element_t Null() { WRAPPER_NO_CONTRACT; return NULL; @@ -203,7 +203,7 @@ public: return e == NULL; } - static const element_t Deleted() + static element_t Deleted() { WRAPPER_NO_CONTRACT; return (element_t)-1; diff --git a/src/vm/peimage.h b/src/vm/peimage.h index f4e2924723..5cfd160e1b 100644 --- a/src/vm/peimage.h +++ b/src/vm/peimage.h @@ -162,7 +162,7 @@ public: BOOL Equals(PEImage *pImage); void GetMVID(GUID *pMvid); - const BOOL HasV1Metadata(); + BOOL HasV1Metadata(); IMDInternalImport* GetMDImport(); BOOL MDImportLoaded(); IMDInternalImport* GetNativeMDImport(BOOL loadAllowed = TRUE); @@ -198,26 +198,26 @@ public: const SString &GetModuleFileNameHintForDAC(); #endif - const BOOL HasNTHeaders(); - const BOOL HasCorHeader(); - const BOOL HasReadyToRunHeader(); + BOOL HasNTHeaders(); + BOOL HasCorHeader(); + BOOL HasReadyToRunHeader(); void SetPassiveDomainOnly(); BOOL PassiveDomainOnly(); BOOL IsReferenceAssembly(); -#ifdef FEATURE_PREJIT - const BOOL IsNativeILILOnly(); - const BOOL IsNativeILDll(); +#ifdef FEATURE_PREJIT + BOOL IsNativeILILOnly(); + BOOL IsNativeILDll(); void GetNativeILPEKindAndMachine(DWORD* pdwKind, DWORD* pdwMachine); PTR_CVOID GetNativeManifestMetadata(COUNT_T *pSize = NULL); #endif - const BOOL HasDirectoryEntry(int entry); - const mdToken GetEntryPointToken(); - const DWORD GetCorHeaderFlags(); - const BOOL IsILOnly(); - const BOOL IsDll(); - const WORD GetSubsystem(); + BOOL HasDirectoryEntry(int entry); + mdToken GetEntryPointToken(); + DWORD GetCorHeaderFlags(); + BOOL IsILOnly(); + BOOL IsDll(); + WORD GetSubsystem(); BOOL IsFileLocked(); - const BOOL HasStrongNameSignature(); + BOOL HasStrongNameSignature(); BOOL IsIbcOptimized(); BOOL Has32BitNTHeaders(); diff --git a/src/vm/peimage.inl b/src/vm/peimage.inl index 8a9c96c77f..2e7fd73f07 100644 --- a/src/vm/peimage.inl +++ b/src/vm/peimage.inl @@ -175,7 +175,7 @@ inline BOOL PEImage::IsReferenceAssembly() } -inline const BOOL PEImage::HasNTHeaders() +inline BOOL PEImage::HasNTHeaders() { WRAPPER_NO_CONTRACT; if (HasLoadedLayout()) @@ -187,7 +187,7 @@ inline const BOOL PEImage::HasNTHeaders() } } -inline const BOOL PEImage::HasCorHeader() +inline BOOL PEImage::HasCorHeader() { WRAPPER_NO_CONTRACT; if (HasLoadedLayout()) @@ -199,7 +199,7 @@ inline const BOOL PEImage::HasCorHeader() } } -inline const BOOL PEImage::HasReadyToRunHeader() +inline BOOL PEImage::HasReadyToRunHeader() { WRAPPER_NO_CONTRACT; if (HasLoadedLayout()) @@ -223,7 +223,7 @@ inline BOOL PEImage::PassiveDomainOnly() return m_bPassiveDomainOnly; } -inline const BOOL PEImage::HasDirectoryEntry(int entry) +inline BOOL PEImage::HasDirectoryEntry(int entry) { WRAPPER_NO_CONTRACT; if (HasLoadedLayout()) @@ -235,7 +235,7 @@ inline const BOOL PEImage::HasDirectoryEntry(int entry) } } -inline const mdToken PEImage::GetEntryPointToken() +inline mdToken PEImage::GetEntryPointToken() { WRAPPER_NO_CONTRACT; if (HasLoadedLayout()) @@ -254,7 +254,7 @@ inline const mdToken PEImage::GetEntryPointToken() } } -inline const DWORD PEImage::GetCorHeaderFlags() +inline DWORD PEImage::GetCorHeaderFlags() { WRAPPER_NO_CONTRACT; @@ -275,13 +275,13 @@ inline BOOL PEImage::MDImportLoaded() return m_pMDImport != NULL; } -inline const BOOL PEImage::HasV1Metadata() +inline BOOL PEImage::HasV1Metadata() { WRAPPER_NO_CONTRACT; return GetMDImport()->GetMetadataStreamVersion()==MD_STREAM_VER_1X; } -inline const BOOL PEImage::IsILOnly() +inline BOOL PEImage::IsILOnly() { WRAPPER_NO_CONTRACT; if (HasLoadedLayout()) @@ -293,7 +293,7 @@ inline const BOOL PEImage::IsILOnly() } } -inline const WORD PEImage::GetSubsystem() +inline WORD PEImage::GetSubsystem() { WRAPPER_NO_CONTRACT; SUPPORTS_DAC; @@ -307,8 +307,8 @@ inline const WORD PEImage::GetSubsystem() } } -#ifdef FEATURE_PREJIT -inline const BOOL PEImage::IsNativeILILOnly() +#ifdef FEATURE_PREJIT +inline BOOL PEImage::IsNativeILILOnly() { WRAPPER_NO_CONTRACT; if (HasLoadedLayout()) @@ -332,7 +332,7 @@ inline void PEImage::GetNativeILPEKindAndMachine(DWORD* pdwKind, DWORD* pdwMachi } } -inline const BOOL PEImage::IsNativeILDll() +inline BOOL PEImage::IsNativeILDll() { WRAPPER_NO_CONTRACT; if (HasLoadedLayout()) @@ -345,7 +345,7 @@ inline const BOOL PEImage::IsNativeILDll() } #endif // FEATURE_PREJIT -inline const BOOL PEImage::IsDll() +inline BOOL PEImage::IsDll() { WRAPPER_NO_CONTRACT; if (HasLoadedLayout()) @@ -357,7 +357,7 @@ inline const BOOL PEImage::IsDll() } } -inline const BOOL PEImage::HasStrongNameSignature() +inline BOOL PEImage::HasStrongNameSignature() { WRAPPER_NO_CONTRACT; if (HasLoadedLayout()) @@ -416,7 +416,7 @@ inline PTR_CVOID PEImage::GetMetadata(COUNT_T *pSize) } } -inline BOOL PEImage::HasNativeHeader() +inline BOOL PEImage::HasNativeHeader() { WRAPPER_NO_CONTRACT; if (HasLoadedLayout()) |