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

CRTP fix for GCC 4.3

Browse Source
This commit is contained in:
Siana Gearz
2011-06-29 00:37:14 +00:00
parent cf889eed44
commit a7952d0929
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llnotify.cpp
View File

@@ -101,7 +101,7 @@ bool LLNotifyBox::onNotification(const LLSD& notify)
//bring existing notification to top //bring existing notification to top
//This getInstance is ugly, as LLNotifyBox is derived from both LLInstanceTracker and LLEventTimer, which also is derived from its own LLInstanceTracker //This getInstance is ugly, as LLNotifyBox is derived from both LLInstanceTracker and LLEventTimer, which also is derived from its own LLInstanceTracker
//Have to explicitly determine which getInstance function to use. //Have to explicitly determine which getInstance function to use.
LLNotifyBox* boxp = LLNotifyBox::LLInstanceTracker<LLNotifyBox, LLUUID>::getInstance(notification->getID()); LLNotifyBox* boxp = LLInstanceTracker<LLNotifyBox, LLUUID>::getInstance(notification->getID());
if (boxp && !boxp->isDead()) if (boxp && !boxp->isDead())
{ {
gNotifyBoxView->showOnly(boxp); gNotifyBoxView->showOnly(boxp);
@@ -118,7 +118,7 @@ bool LLNotifyBox::onNotification(const LLSD& notify)
} }
else if (notify["sigtype"].asString() == "delete") else if (notify["sigtype"].asString() == "delete")
{ {
LLNotifyBox* boxp = LLNotifyBox::LLInstanceTracker<LLNotifyBox, LLUUID>::getInstance(notification->getID()); LLNotifyBox* boxp = LLInstanceTracker<LLNotifyBox, LLUUID>::getInstance(notification->getID());
if (boxp && !boxp->isDead()) if (boxp && !boxp->isDead())
{ {
boxp->close(); boxp->close();