AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gallium/swr: simplify environmental variabled expansion code

Browse Source 
There were 2 versions of code doing the same thing.
Since std::regexp are locale-sensitive better is to leave old
good way to do this.

Reviewed-by: Jan Zielinski <jan.zielinski@intel.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3761>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3761>
This commit is contained in:
Krzysztof Raszkowski
2020-02-10 16:24:10 +01:00
parent 34fd894e42
commit 689817c9df
1 changed files with 0 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/swr/rasterizer/codegen/templates/gen_knobs.cpp
-29
View File
@@ -43,9 +43,6 @@
//========================================================
void KnobBase::autoExpandEnvironmentVariables(std::string& text)
{
#if (__GNUC__) && (GCC_VERSION < 40900)
// <regex> isn't implemented prior to gcc-4.9.0
// unix style variable replacement
size_t start;
while ((start = text.find("${'${'}")) != std::string::npos)
{
@@ -64,32 +61,6 @@ void KnobBase::autoExpandEnvironmentVariables(std::string& text)
const std::string var = GetEnv(text.substr(start + 1, end - start - 1));
text.replace(start, end - start + 1, var);
}
#else
{
// unix style variable replacement
static std::regex env("\\$\\{([^}]+?)\\}");
std::smatch match;
while (std::regex_search(text, match, env))
{
const std::string var = GetEnv(match[1].str());
// certain combinations of gcc/libstd++ have problems with this
// text.replace(match[0].first, match[0].second, var);
text.replace(match.prefix().length(), match[0].length(), var);
}
}
{
// win32 style variable replacement
static std::regex env("%([^%]+?)%");
std::smatch match;
while (std::regex_search(text, match, env))
{
const std::string var = GetEnv(match[1].str());
// certain combinations of gcc/libstd++ have problems with this
// text.replace(match[0].first, match[0].second, var);
text.replace(match.prefix().length(), match[0].length(), var);
}
}
#endif
}
//========================================================