aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview
diff options
context:
space:
mode:
authorJacek Antonelli2011-04-18 02:16:56 -0500
committerJacek Antonelli2011-04-18 02:16:56 -0500
commit8ddc97a69fd635dc6596e3470db0120e2af43fa6 (patch)
treeb291455232036f861784b8d9e68c7a2aa85b1471 /linden/indra/newview
parentUpdated the default_grids.xml entry for InWorldz (and fixed the capitalization) (diff)
downloadmeta-impy-8ddc97a69fd635dc6596e3470db0120e2af43fa6.zip
meta-impy-8ddc97a69fd635dc6596e3470db0120e2af43fa6.tar.gz
meta-impy-8ddc97a69fd635dc6596e3470db0120e2af43fa6.tar.bz2
meta-impy-8ddc97a69fd635dc6596e3470db0120e2af43fa6.tar.xz
Fixed a GCC warning in LLFloaterInspect, related to nested templates.
The '>>' in the code 'std::map<LLUUID, std::pair<S32, S32>>' 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
Diffstat (limited to 'linden/indra/newview')
-rw-r--r--linden/indra/newview/llfloaterinspect.cpp2
-rw-r--r--linden/indra/newview/llfloaterinspect.h2
2 files changed, 2 insertions, 2 deletions
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()
320 // inventory silliness 320 // inventory silliness
321 S32 scripts = 0; 321 S32 scripts = 0;
322 S32 total_inv = 0; 322 S32 total_inv = 0;
323 std::map<LLUUID, std::pair<S32, S32>>::iterator itr = mInventoryNums.find(obj->getObject()->getID()); 323 std::map<LLUUID, std::pair<S32, S32> >::iterator itr = mInventoryNums.find(obj->getObject()->getID());
324 if (itr != mInventoryNums.end()) 324 if (itr != mInventoryNums.end())
325 { 325 {
326 scripts = itr->second.first; 326 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:
75 static LLFloaterInspect* sInstance; 75 static LLFloaterInspect* sInstance;
76 76
77 LLSafeHandle<LLObjectSelection> mObjectSelection; 77 LLSafeHandle<LLObjectSelection> mObjectSelection;
78 std::map<LLUUID, std::pair<S32, S32>> mInventoryNums; //<scripts, total> 78 std::map<LLUUID, std::pair<S32, S32> > mInventoryNums; //<scripts, total>
79 std::vector<LLUUID> mQueue; 79 std::vector<LLUUID> mQueue;
80}; 80};
81 81