diff options
author | callum_linden <none@none> | 2014-12-15 13:35:03 -0800 |
---|---|---|
committer | callum_linden <none@none> | 2014-12-15 13:35:03 -0800 |
commit | f884c008d5bb693ca93f6bf28221528666816e7e (patch) | |
tree | e43ee3bc93943f6f077e55d6bfa51c8162b02a44 /indra | |
parent | d23803c74eb154360ae7ea7f48df1b00615fae52 (diff) |
fix for some std::pair/STL syntax
Diffstat (limited to 'indra')
-rwxr-xr-x | indra/newview/llcommunicationchannel.cpp | 2 | ||||
-rwxr-xr-x | indra/newview/llfloaterpathfindingobjects.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llcommunicationchannel.cpp b/indra/newview/llcommunicationchannel.cpp index 627c9eb5c0..cf98b56b4c 100755 --- a/indra/newview/llcommunicationchannel.cpp +++ b/indra/newview/llcommunicationchannel.cpp @@ -108,6 +108,6 @@ void LLCommunicationChannel::onFilterFail(LLNotificationPtr pNotificationPtr) || (notificationType == "notifytoast")) && !pNotificationPtr->isCancelled()) { - mHistory.insert(std::make_pair<LLDate, LLNotificationPtr>(pNotificationPtr->getDate(), pNotificationPtr)); + mHistory.insert(history_list_t::value_type(pNotificationPtr->getDate(), pNotificationPtr)); } } diff --git a/indra/newview/llfloaterpathfindingobjects.cpp b/indra/newview/llfloaterpathfindingobjects.cpp index d72ee073e1..f6ff83eaf4 100755 --- a/indra/newview/llfloaterpathfindingobjects.cpp +++ b/indra/newview/llfloaterpathfindingobjects.cpp @@ -406,7 +406,7 @@ void LLFloaterPathfindingObjects::addObjectToScrollList(const LLPathfindingObjec if (pObjectPtr->hasOwner() && !pObjectPtr->hasOwnerName()) { - mMissingNameObjectsScrollListItems.insert(std::make_pair<std::string, LLScrollListItem *>(pObjectPtr->getUUID().asString(), scrollListItem)); + mMissingNameObjectsScrollListItems.insert(scroll_list_item_map::value_type(pObjectPtr->getUUID().asString(), scrollListItem)); pObjectPtr->registerOwnerNameListener(boost::bind(&LLFloaterPathfindingObjects::handleObjectNameResponse, this, _1)); } } |