From d46f96a8d620b6e2c87c1551ea594bed5c0798af Mon Sep 17 00:00:00 2001 From: Shyotl Date: Thu, 8 Feb 2018 03:18:09 -0600 Subject: [PATCH 1/2] =?UTF-8?q?Fix=20'function=20uses=20=E2=80=98auto?= =?UTF-8?q?=E2=80=99=20type=20specifier=20without=20trailing=20return=20ty?= =?UTF-8?q?pe'=20spam=20in=20gcc=20due=20to=20accidentally=20using=20c++14?= =?UTF-8?q?=20syntax.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- indra/newview/llvoavatar.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index d8f90a1bc..f8451604b 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -1100,7 +1100,7 @@ protected: // Shared with LLVOAvatarSelf public: typedef std::array rigged_matrix_array_t; typedef std::vector > > rigged_transformation_cache_t; - auto& getRiggedMatrixCache() + rigged_transformation_cache_t& getRiggedMatrixCache() { return mRiggedMatrixDataCache; } From 410d2a83a2d7eb3311dbf2d83631e22499122492 Mon Sep 17 00:00:00 2001 From: Shyotl Date: Thu, 8 Feb 2018 03:25:02 -0600 Subject: [PATCH 2/2] llformat with std::string args is no bueno. --- indra/newview/shupdatechecker.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/shupdatechecker.cpp b/indra/newview/shupdatechecker.cpp index 65c7f5db3..0d415f66c 100644 --- a/indra/newview/shupdatechecker.cpp +++ b/indra/newview/shupdatechecker.cpp @@ -65,7 +65,7 @@ public: return; } - std::string viewer_version = llformat("%s (%i)", LLVersionInfo::getShortVersion(), LLVersionInfo::getBuild()); + std::string viewer_version = llformat("%s (%i)", LLVersionInfo::getShortVersion().c_str(), LLVersionInfo::getBuild()); const Json::Value data = root[mType]; #if LL_WINDOWS