summaryrefslogtreecommitdiff
path: root/indra/llmath
diff options
context:
space:
mode:
authorsimon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com>2012-10-17 12:36:11 -0700
committersimon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com>2012-10-17 12:36:11 -0700
commit4d807ba638cea8898beed5ca8e7e1951adb962bb (patch)
treef997e76de0e514cf11974848684e4b3f9e424172 /indra/llmath
parent161c848e3d78a1ec6265b33b3d9f999dd11126f9 (diff)
parent8c8c2f3b940059f82777c9b0b9f40e4d2f7bc6ab (diff)
Merge in upstream fixes
Diffstat (limited to 'indra/llmath')
-rw-r--r--indra/llmath/lloctree.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmath/lloctree.h b/indra/llmath/lloctree.h
index 68d8110f1d..7348904c61 100644
--- a/indra/llmath/lloctree.h
+++ b/indra/llmath/lloctree.h
@@ -78,7 +78,7 @@ public:
typedef LLOctreeTraveler<T> oct_traveler;
typedef LLTreeTraveler<T> tree_traveler;
- typedef std::vector<LLPointer<T>> element_list;
+ typedef std::vector< LLPointer<T> > element_list; // note: don't remove the whitespace between "> >"
typedef LLPointer<T>* element_iter;
typedef const LLPointer<T>* const_element_iter;
typedef typename std::vector<LLTreeListener<T>*>::iterator tree_listener_iter;