From 8ddc97a69fd635dc6596e3470db0120e2af43fa6 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Mon, 18 Apr 2011 02:16:56 -0500 Subject: Fixed a GCC warning in LLFloaterInspect, related to nested templates. The '>>' in the code 'std::map>' could mean bitwise right shift. Using '> >' is unambiguous/better. Full warning message was: cc1plus: warnings being treated as errors In file included from /home/jacek/imprudence/linden/indra/newview/llfloaterinspect.cpp:35: /home/jacek/imprudence/linden/indra/newview/llfloaterinspect.h:78: error: ‘>>’ operator will be treated as two right angle brackets in C++0x /home/jacek/imprudence/linden/indra/newview/llfloaterinspect.h:78: error: suggest parentheses around ‘>>’ expression --- linden/indra/newview/llfloaterinspect.cpp | 2 +- linden/indra/newview/llfloaterinspect.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'linden/indra/newview') diff --git a/linden/indra/newview/llfloaterinspect.cpp b/linden/indra/newview/llfloaterinspect.cpp index a8a6bb5..e22b8f6 100644 --- a/linden/indra/newview/llfloaterinspect.cpp +++ b/linden/indra/newview/llfloaterinspect.cpp @@ -320,7 +320,7 @@ void LLFloaterInspect::refresh() // inventory silliness S32 scripts = 0; S32 total_inv = 0; - std::map>::iterator itr = mInventoryNums.find(obj->getObject()->getID()); + std::map >::iterator itr = mInventoryNums.find(obj->getObject()->getID()); if (itr != mInventoryNums.end()) { scripts = itr->second.first; diff --git a/linden/indra/newview/llfloaterinspect.h b/linden/indra/newview/llfloaterinspect.h index 959eea6..ae443f9 100644 --- a/linden/indra/newview/llfloaterinspect.h +++ b/linden/indra/newview/llfloaterinspect.h @@ -75,7 +75,7 @@ private: static LLFloaterInspect* sInstance; LLSafeHandle mObjectSelection; - std::map> mInventoryNums; // + std::map > mInventoryNums; // std::vector mQueue; }; -- cgit v1.1