From fd6b367746c564fd1469df6d8c55f2e0c9b5bc0a Mon Sep 17 00:00:00 2001 From: Router Gray Date: Sat, 13 Apr 2019 15:43:47 -0500 Subject: [PATCH] Fix missed changes for is_trivially_copyable and make gcc happy about them (#4) --- indra/llmath/llmatrix3a.h | 4 ++-- indra/newview/llimpanel.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/llmath/llmatrix3a.h b/indra/llmath/llmatrix3a.h index ea0c99237..40632644b 100644 --- a/indra/llmath/llmatrix3a.h +++ b/indra/llmath/llmatrix3a.h @@ -127,6 +127,6 @@ public: inline bool isOkRotation() const; } LL_ALIGN_POSTFIX(16); -static_assert(std::is_trivially_copyable{}, "LLMatrix3a must be a trivially copyable type"); -static_assert(std::is_trivially_copyable{}, "LLRotation must be a trivially copyable type"); +static_assert(std::is_trivially_copyable::value, "LLMatrix3a must be a trivially copyable type"); +static_assert(std::is_trivially_copyable::value, "LLRotation must be a trivially copyable type"); #endif diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp index 6851a476a..e40970565 100644 --- a/indra/newview/llimpanel.cpp +++ b/indra/newview/llimpanel.cpp @@ -1368,7 +1368,7 @@ void LLFloaterIMPanel::onSendMsg() if (mSessionType == SUPPORT_SESSION && getChildView("Support Check")->getValue()) { - utf8_text.insert(action ? 3 : 0, llformat(action ? " (%d%s)" : "(%d%s): ", LL_VIEWER_VERSION_BUILD, wstring_to_utf8str(LL_VIEWER_CHANNEL_GRK))); + utf8_text.insert(action ? 3 : 0, llformat(action ? " (%d%s)" : "(%d%s): ", LL_VIEWER_VERSION_BUILD, wstring_to_utf8str(LL_VIEWER_CHANNEL_GRK).data())); } if ( mSessionInitialized )