Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix missed changes for is_trivially_copyable and make gcc happy about them (#4)

Browse Source
This commit is contained in:
Router Gray
2019-04-13 15:43:47 -05:00
committed by Liru Færs
parent 5e12a9d057
commit fd6b367746
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llmath/llmatrix3a.h
View File

@@ -127,6 +127,6 @@ public:
inline bool isOkRotation() const; inline bool isOkRotation() const;
} LL_ALIGN_POSTFIX(16); } LL_ALIGN_POSTFIX(16);
static_assert(std::is_trivially_copyable<LLMatrix3a>{}, "LLMatrix3a must be a trivially copyable type"); static_assert(std::is_trivially_copyable<LLMatrix3a>::value, "LLMatrix3a must be a trivially copyable type");
static_assert(std::is_trivially_copyable<LLRotation>{}, "LLRotation must be a trivially copyable type"); static_assert(std::is_trivially_copyable<LLRotation>::value, "LLRotation must be a trivially copyable type");
#endif #endif

2
indra/newview/llimpanel.cpp
View File

@@ -1368,7 +1368,7 @@ void LLFloaterIMPanel::onSendMsg()
if (mSessionType == SUPPORT_SESSION && getChildView("Support Check")->getValue()) 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 ) if ( mSessionInitialized )