diff options
author | Tank_Master <tank.master@phoenixviewer.com> | 2014-01-18 10:56:00 -0800 |
---|---|---|
committer | Tank_Master <tank.master@phoenixviewer.com> | 2014-01-18 10:56:00 -0800 |
commit | 091185b057d312e05f6b7ec7d03a37dec0879adf (patch) | |
tree | 48d4d4b4d3c1b02e40f9b029cf65bb200687f087 /indra/llcommon/llinstancetracker.cpp | |
parent | a0ac409e8a4a822a55e9079b4a6d947af5edf220 (diff) | |
parent | d8a81b240e828a8ab27709fb11038a4b5c4d5428 (diff) |
Merge
Diffstat (limited to 'indra/llcommon/llinstancetracker.cpp')
-rwxr-xr-x[-rw-r--r--] | indra/llcommon/llinstancetracker.cpp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/indra/llcommon/llinstancetracker.cpp b/indra/llcommon/llinstancetracker.cpp index 5dc3ea5d7b..64a313b5ff 100644..100755 --- a/indra/llcommon/llinstancetracker.cpp +++ b/indra/llcommon/llinstancetracker.cpp @@ -32,18 +32,3 @@ // external library headers // other Linden headers -//static -void * & LLInstanceTrackerBase::getInstances(std::type_info const & info) -{ - typedef std::map<std::string, void *> InstancesMap; - static InstancesMap instances; - - // std::map::insert() is just what we want here. You attempt to insert a - // (key, value) pair. If the specified key doesn't yet exist, it inserts - // the pair and returns a std::pair of (iterator, true). If the specified - // key DOES exist, insert() simply returns (iterator, false). One lookup - // handles both cases. - return instances.insert(InstancesMap::value_type(info.name(), - InstancesMap::mapped_type())) - .first->second; -} |