Merge pull request #1924 from JohnChen0/release/1.0.0-rc1

ellismg · ellismg · commit f9fd9cf519ea · 2015-11-02T16:29:06.000-08:00
Fix a crossgen assert on Linux
diff --git a/src/utilcode/sstring_com.cpp b/src/utilcode/sstring_com.cpp
@@ -39,7 +39,7 @@ HRESULT SString::LoadResourceAndReturnHR(CCompRC* pResourceDLL, CCompRC::Resourc
 
     HRESULT hr = E_FAIL;
 
-#ifndef FEATURE_UTILCODE_NO_DEPENDENCIES
+#if !defined(FEATURE_UTILCODE_NO_DEPENDENCIES) && !(defined(CROSSGEN_COMPILE) && defined(PLATFORM_UNIX))
     if (pResourceDLL == NULL) 
     {
         pResourceDLL = CCompRC::GetDefaultResourceDll();

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ HRESULT SString::LoadResourceAndReturnHR(CCompRC* pResourceDLL, CCompRC::Resourc`
`39`	`39`
`40`	`40`	`HRESULT hr = E_FAIL;`
`41`	`41`
`42`		`-#ifndef FEATURE_UTILCODE_NO_DEPENDENCIES`
	`42`	`+#if !defined(FEATURE_UTILCODE_NO_DEPENDENCIES) && !(defined(CROSSGEN_COMPILE) && defined(PLATFORM_UNIX))`
`43`	`43`	`if (pResourceDLL == NULL)`
`44`	`44`	`{`
`45`	`45`	`pResourceDLL = CCompRC::GetDefaultResourceDll();`