From ded724c644fd83c383a043de5d311a2af6527a31 Mon Sep 17 00:00:00 2001
From: Miezhiko <Miezhiko@gmail.com>
Date: Fri, 24 Mar 2023 10:25:24 +0400
Subject: [PATCH] fix building on clang 16 == between T* and LLPointer<T> is
ambiguous
Signed-off-by: Miezhiko <Miezhiko@gmail.com>
---
indra/llprimitive/llprimitive.cpp | 2 +-
indra/llxml/llxmlnode.cpp | 6 +++---
indra/newview/lldrawpool.cpp | 6 +++---
indra/newview/lldrawpoolalpha.cpp | 6 +++---
indra/newview/lldrawpoolbump.cpp | 4 ++--
indra/newview/llhudeffectlookat.cpp | 2 +-
indra/newview/llhudeffectpointat.cpp | 2 +-
indra/newview/llhudeffecttrail.cpp | 2 +-
indra/newview/llhudobject.cpp | 4 ++--
indra/newview/llselectmgr.cpp | 2 +-
indra/newview/llviewertexture.cpp | 2 +-
indra/newview/llviewerwindow.cpp | 2 +-
indra/newview/pipeline.cpp | 2 +-
13 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/indra/llprimitive/llprimitive.cpp b/indra/llprimitive/llprimitive.cpp
index f8a0987160a..8789569dbf5 100644
--- a/indra/llprimitive/llprimitive.cpp
+++ b/indra/llprimitive/llprimitive.cpp
@@ -797,7 +797,7 @@ BOOL LLPrimitive::setVolume(const LLVolumeParams &volume_params, const S32 detai
}
volumep = sVolumeManager->refVolume(volume_params, detail);
- if (volumep == mVolumep)
+ if (volumep == mVolumep.get())
{
sVolumeManager->unrefVolume( volumep ); // LLVolumeMgr::refVolume() creates a reference, but we don't need a second one.
return TRUE;
diff --git a/indra/llxml/llxmlnode.cpp b/indra/llxml/llxmlnode.cpp
index 4c260935490..916e0b6cb9e 100644
--- a/indra/llxml/llxmlnode.cpp
+++ b/indra/llxml/llxmlnode.cpp
@@ -218,13 +218,13 @@ BOOL LLXMLNode::removeChild(LLXMLNode *target_child)
LLXMLChildList::iterator children_itr = mChildren->map.find(target_child->mName);
while (children_itr != mChildren->map.end())
{
- if (target_child == children_itr->second)
+ if (target_child == children_itr->second.get())
{
- if (target_child == mChildren->head)
+ if (target_child == mChildren->head.get())
{
mChildren->head = target_child->mNext;
}
- if (target_child == mChildren->tail)
+ if (target_child == mChildren->tail.get())
{
mChildren->tail = target_child->mPrev;
}
diff --git a/indra/newview/lldrawpool.cpp b/indra/newview/lldrawpool.cpp
index 2303479e764..351270adbc7 100644
--- a/indra/newview/lldrawpool.cpp
+++ b/indra/newview/lldrawpool.cpp
@@ -414,7 +414,7 @@ void LLRenderPass::renderRiggedGroup(LLSpatialGroup* group, U32 type, U32 mask,
LLDrawInfo* pparams = *k;
if (pparams)
{
- if (lastAvatar != pparams->mAvatar || lastMeshId != pparams->mSkinInfo->mHash)
+ if (lastAvatar != pparams->mAvatar.get() || lastMeshId != pparams->mSkinInfo->mHash)
{
uploadMatrixPalette(*pparams);
lastAvatar = pparams->mAvatar;
@@ -450,7 +450,7 @@ void LLRenderPass::pushRiggedBatches(U32 type, U32 mask, BOOL texture, BOOL batc
LLDrawInfo* pparams = *i;
if (pparams)
{
- if (pparams->mAvatar.notNull() && (lastAvatar != pparams->mAvatar || lastMeshId != pparams->mSkinInfo->mHash))
+ if (pparams->mAvatar.notNull() && (lastAvatar != pparams->mAvatar.get() || lastMeshId != pparams->mSkinInfo->mHash))
{
uploadMatrixPalette(*pparams);
lastAvatar = pparams->mAvatar;
@@ -495,7 +495,7 @@ void LLRenderPass::pushRiggedMaskBatches(U32 type, U32 mask, BOOL texture, BOOL
gGL.flush();
}
- if (lastAvatar != pparams->mAvatar || lastMeshId != pparams->mSkinInfo->mHash)
+ if (lastAvatar != pparams->mAvatar.get() || lastMeshId != pparams->mSkinInfo->mHash)
{
uploadMatrixPalette(*pparams);
lastAvatar = pparams->mAvatar;
diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp
index b46ef80fe87..0568270dd23 100644
--- a/indra/newview/lldrawpoolalpha.cpp
+++ b/indra/newview/lldrawpoolalpha.cpp
@@ -353,7 +353,7 @@ void LLDrawPoolAlpha::renderAlphaHighlight(U32 mask)
if (rigged)
{
- if (lastAvatar != params.mAvatar ||
+ if (lastAvatar != params.mAvatar.get() ||
lastMeshId != params.mSkinInfo->mHash)
{
if (!uploadMatrixPalette(params))
@@ -514,7 +514,7 @@ void LLDrawPoolAlpha::renderRiggedEmissives(U32 mask, std::vector<LLDrawInfo*>&
for (LLDrawInfo* draw : emissives)
{
bool tex_setup = TexSetup(draw, false);
- if (lastAvatar != draw->mAvatar || lastMeshId != draw->mSkinInfo->mHash)
+ if (lastAvatar != draw->mAvatar.get() || lastMeshId != draw->mSkinInfo->mHash)
{
if (!uploadMatrixPalette(*draw))
{ // failed to upload matrix palette, skip rendering
@@ -708,7 +708,7 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask, bool depth_only, bool rigged)
if (params.mAvatar != nullptr)
{
- if (lastAvatar != params.mAvatar ||
+ if (lastAvatar != params.mAvatar.get() ||
lastMeshId != params.mSkinInfo->mHash ||
lastAvatarShader != LLGLSLShader::sCurBoundShaderPtr)
{
diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp
index 906b1139a6b..2fd85ff7e45 100644
--- a/indra/newview/lldrawpoolbump.cpp
+++ b/indra/newview/lldrawpoolbump.cpp
@@ -704,7 +704,7 @@ void LLDrawPoolBump::renderDeferred(S32 pass)
if (rigged)
{
- if (avatar != params.mAvatar || skin != params.mSkinInfo->mHash)
+ if (avatar != params.mAvatar.get() || skin != params.mSkinInfo->mHash)
{
uploadMatrixPalette(params);
avatar = params.mAvatar;
@@ -1332,7 +1332,7 @@ void LLDrawPoolBump::renderBump(U32 type, U32 mask)
{
if (mRigged)
{
- if (avatar != params.mAvatar || skin != params.mSkinInfo->mHash)
+ if (avatar != params.mAvatar.get() || skin != params.mSkinInfo->mHash)
{
if (uploadMatrixPalette(params))
{
diff --git a/indra/newview/llhudeffectlookat.cpp b/indra/newview/llhudeffectlookat.cpp
index 26482130bd0..4e3e91d03e2 100644
--- a/indra/newview/llhudeffectlookat.cpp
+++ b/indra/newview/llhudeffectlookat.cpp
@@ -440,7 +440,7 @@ BOOL LLHUDEffectLookAt::setLookAt(ELookAtType target_type, LLViewerObject *objec
if (!clamp_lookat)
{
// type of lookat behavior or target object has changed
- bool lookAtChanged = (target_type != mTargetType) || (object != mTargetObject);
+ bool lookAtChanged = (target_type != mTargetType) || (object != mTargetObject.get());
// lookat position has moved a certain amount and we haven't just sent an update
lookAtChanged = lookAtChanged || ((dist_vec_squared(position, mLastSentOffsetGlobal) > MIN_DELTAPOS_FOR_UPDATE_SQUARED) &&
diff --git a/indra/newview/llhudeffectpointat.cpp b/indra/newview/llhudeffectpointat.cpp
index ecf6d42d692..ebce62a6271 100644
--- a/indra/newview/llhudeffectpointat.cpp
+++ b/indra/newview/llhudeffectpointat.cpp
@@ -242,7 +242,7 @@ BOOL LLHUDEffectPointAt::setPointAt(EPointAtType target_type, LLViewerObject *ob
// type of pointat behavior or target object has changed
BOOL targetTypeChanged = (target_type != mTargetType) ||
- (object != mTargetObject);
+ (object != mTargetObject.get());
BOOL targetPosChanged = (dist_vec_squared(position, mLastSentOffsetGlobal) > MIN_DELTAPOS_FOR_UPDATE_SQUARED) &&
((current_time - mLastSendTime) > (1.f / MAX_SENDS_PER_SEC));
diff --git a/indra/newview/llhudeffecttrail.cpp b/indra/newview/llhudeffecttrail.cpp
index 5fbfa393360..a033c3ae08a 100644
--- a/indra/newview/llhudeffecttrail.cpp
+++ b/indra/newview/llhudeffecttrail.cpp
@@ -252,7 +252,7 @@ void LLHUDEffectSpiral::triggerLocal()
void LLHUDEffectSpiral::setTargetObject(LLViewerObject *objp)
{
- if (objp == mTargetObject)
+ if (objp == mTargetObject.get())
{
return;
}
diff --git a/indra/newview/llhudobject.cpp b/indra/newview/llhudobject.cpp
index 7e18da88a7b..063c2e8c863 100644
--- a/indra/newview/llhudobject.cpp
+++ b/indra/newview/llhudobject.cpp
@@ -85,7 +85,7 @@ F32 LLHUDObject::getDistance() const
void LLHUDObject::setSourceObject(LLViewerObject* objectp)
{
- if (objectp == mSourceObject)
+ if (objectp == mSourceObject.get())
{
return;
}
@@ -95,7 +95,7 @@ void LLHUDObject::setSourceObject(LLViewerObject* objectp)
void LLHUDObject::setTargetObject(LLViewerObject* objectp)
{
- if (objectp == mTargetObject)
+ if (objectp == mTargetObject.get())
{
return;
}
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index a9869224ec4..3fe4b68a069 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -7313,7 +7313,7 @@ void LLObjectSelection::moveNodeToFront(LLSelectNode *nodep)
void LLObjectSelection::removeNode(LLSelectNode *nodep)
{
mSelectNodeMap.erase(nodep->getObject());
- if (nodep->getObject() == mPrimaryObject)
+ if (nodep->getObject() == mPrimaryObject.get())
{
mPrimaryObject = NULL;
}
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index bd18b997b46..2664751ea19 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -788,7 +788,7 @@ bool LLViewerTexture::bindDefaultImage(S32 stage)
// use default if we've got it
res = gGL.getTexUnit(stage)->bind(LLViewerFetchedTexture::sDefaultImagep);
}
- if (!res && LLViewerTexture::sNullImagep.notNull() && (this != LLViewerTexture::sNullImagep))
+ if (!res && LLViewerTexture::sNullImagep.notNull() && (this != LLViewerTexture::sNullImagep.get()))
{
res = gGL.getTexUnit(stage)->bind(LLViewerTexture::sNullImagep);
}
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 0f524ebceb5..23e10ece006 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -1449,7 +1449,7 @@ LLWindowCallbacks::DragNDropResult LLViewerWindow::handleDragNDrop( LLWindow *wi
// Check the whitelist, if there's media (otherwise just show it)
if (te->getMediaData() == NULL || te->getMediaData()->checkCandidateUrl(url))
{
- if ( obj != mDragHoveredObject)
+ if ( obj != mDragHoveredObject.get())
{
// Highlight the dragged object
LLSelectMgr::getInstance()->unhighlightObjectOnly(mDragHoveredObject);
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 781b4391303..8998fc585ad 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -7466,7 +7466,7 @@ void LLPipeline::renderAlphaObjects(U32 mask, bool texture, bool batch_texture,
{
if (pparams->mAvatar != nullptr)
{
- if (lastAvatar != pparams->mAvatar || lastMeshId != pparams->mSkinInfo->mHash)
+ if (lastAvatar != pparams->mAvatar.get() || lastMeshId != pparams->mSkinInfo->mHash)
{
mSimplePool->uploadMatrixPalette(*pparams);
lastAvatar = pparams->mAvatar;
--
GitLab