Skip to content

Commit 9b57a26

Browse files
Fix contract and remove unused method overload (#100722)
1 parent e0ff36d commit 9b57a26

File tree

2 files changed

+2
-13
lines changed

2 files changed

+2
-13
lines changed

src/coreclr/inc/sstring.h

-1
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,6 @@ class EMPTY_BASES_DECL SString : private SBuffer
574574
public:
575575
BOOL LoadResource(CCompRC::ResourceCategory eCategory, int resourceID);
576576
HRESULT LoadResourceAndReturnHR(CCompRC::ResourceCategory eCategory, int resourceID);
577-
HRESULT LoadResourceAndReturnHR(CCompRC* pResourceDLL, CCompRC::ResourceCategory eCategory, int resourceID);
578577
BOOL FormatMessage(DWORD dwFlags, LPCVOID lpSource, DWORD dwMessageId, DWORD dwLanguageId,
579578
const SString &arg1 = Empty(), const SString &arg2 = Empty(),
580579
const SString &arg3 = Empty(), const SString &arg4 = Empty(),

src/coreclr/utilcode/sstring_com.cpp

+2-12
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,7 @@ BOOL SString::LoadResource(CCompRC::ResourceCategory eCategory, int resourceID)
2222

2323
HRESULT SString::LoadResourceAndReturnHR(CCompRC::ResourceCategory eCategory, int resourceID)
2424
{
25-
WRAPPER_NO_CONTRACT;
26-
return LoadResourceAndReturnHR(NULL, eCategory,resourceID);
27-
}
28-
29-
HRESULT SString::LoadResourceAndReturnHR(CCompRC* pResourceDLL, CCompRC::ResourceCategory eCategory, int resourceID)
30-
{
31-
CONTRACT(BOOL)
25+
CONTRACT(HRESULT)
3226
{
3327
INSTANCE_CHECK;
3428
NOTHROW;
@@ -38,11 +32,7 @@ HRESULT SString::LoadResourceAndReturnHR(CCompRC* pResourceDLL, CCompRC::Resourc
3832
HRESULT hr = E_FAIL;
3933

4034
#ifndef FEATURE_UTILCODE_NO_DEPENDENCIES
41-
if (pResourceDLL == NULL)
42-
{
43-
pResourceDLL = CCompRC::GetDefaultResourceDll();
44-
}
45-
35+
CCompRC* pResourceDLL = CCompRC::GetDefaultResourceDll();
4636
if (pResourceDLL != NULL)
4737
{
4838

0 commit comments

Comments
 (0)