Fix compile error in CStringMapReader::ReadString

botder · botder · commit 3b624da9072a · 2019-08-22T18:07:02.000+02:00
diff --git a/Shared/sdk/CStringMap.h b/Shared/sdk/CStringMap.h
@@ -18,7 +18,11 @@ class CStringMapReader : public std::map<SString, V>
     void ReadString(const SString& strKeyName, SString& strOutValue, const char* szDefaultValue)
     {
         V* pstrValue = MapFind(*this, strKeyName);
-        strOutValue = pstrValue ? *pstrValue : szDefaultValue;
+
+        if (pstrValue)
+            strOutValue = *pstrValue;
+        else
+            strOutValue = szDefaultValue; 
     }
 
     template <typename T, typename U>

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,11 @@ class CStringMapReader : public std::map<SString, V>`
`18`	`18`	`void ReadString(const SString& strKeyName, SString& strOutValue, const char* szDefaultValue)`
`19`	`19`	`{`
`20`	`20`	`V* pstrValue = MapFind(*this, strKeyName);`
`21`		`- strOutValue = pstrValue ? *pstrValue : szDefaultValue;`
	`21`	`+`
	`22`	`+ if (pstrValue)`
	`23`	`+ strOutValue = *pstrValue;`
	`24`	`+ else`
	`25`	`+ strOutValue = szDefaultValue;`
`22`	`26`	`}`
`23`	`27`
`24`	`28`	`template <typename T, typename U>`