From fec7e954068e6449a390068491814f6d1e2365d9 Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Fri, 8 Mar 2019 13:33:40 -0500 Subject: [PATCH] Fix compile and try to prevent that from happening in the future --- indra/newview/shupdatechecker.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/indra/newview/shupdatechecker.cpp b/indra/newview/shupdatechecker.cpp index a30fc03db..83ece6d75 100644 --- a/indra/newview/shupdatechecker.cpp +++ b/indra/newview/shupdatechecker.cpp @@ -62,15 +62,14 @@ public: const auto data = root[mType]; #if LL_WINDOWS - std::string recommended_version = data["recommended"]["windows"]; - std::string minimum_version = data["minimum"]["windows"]; + constexpr auto platform = "windows"; #elif LL_LINUX - std::string recommended_version = data["recommended"]["linux"].asString(); - std::string minimum_version = data["minimum"]["linux"].asString(); + constexpr auto platform = "linux"; #elif LL_DARWIN - std::string recommended_version = data["recommended"]["apple"].asString(); - std::string minimum_version = data["minimum"]["apple"].asString(); + constexpr auto platform = "apple"; #endif + std::string recommended_version = data["recommended"][platform]; + std::string minimum_version = data["minimum"][platform]; S32 minimum_build, recommended_build; sscanf(recommended_version.c_str(), "%*i.%*i.%*i (%i)", &recommended_build);