summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2012-07-10 17:29:58 -0400
committerNat Goodspeed <nat@lindenlab.com>2012-07-10 17:29:58 -0400
commit70035274093e8803f8c7f28162feef311ef725b4 (patch)
tree0ec9f6eaeacd0f87181a8097c2537ba36696e57f /indra/llcommon
parent00ae56334c057c1ea5ad08c604b551fcbdf37a30 (diff)
MAINT-1175: Still grappling with MSVC idiosyncracies.
Maybe it's failing to correctly handle overloaded transform() methods?
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/lltypeinfolookup.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llcommon/lltypeinfolookup.h b/indra/llcommon/lltypeinfolookup.h
index 583ca8863b..679cc51f1d 100644
--- a/indra/llcommon/lltypeinfolookup.h
+++ b/indra/llcommon/lltypeinfolookup.h
@@ -66,8 +66,8 @@ public:
iterator begin() { return transform(mMap.begin()); }
iterator end() { return transform(mMap.end()); }
- const_iterator begin() const { return transform(mMap.begin()); }
- const_iterator end() const { return transform(mMap.end()); }
+ const_iterator begin() const { return const_transform(mMap.begin()); }
+ const_iterator end() const { return const_transform(mMap.end()); }
bool empty() const { return mMap.empty(); }
std::size_t size() const { return mMap.size(); }
@@ -94,7 +94,7 @@ public:
const_iterator find(const std::type_info* key) const
{
- return transform(mMap.find(key->name()));
+ return const_transform(mMap.find(key->name()));
}
private:
@@ -102,7 +102,7 @@ private:
{
return iterator(iter, boost::mem_fn(&impl_value_type::second));
}
- const_iterator transform(impl_const_iterator iter)
+ const_iterator const_transform(impl_const_iterator iter)
{
return const_iterator(iter, boost::mem_fn(&impl_value_type::second));
}