Skip to content

Commit

Permalink
Re #6198. Fix last use of mapping method in Framework.
Browse files Browse the repository at this point in the history
We're relying on the move assignment operator here for efficiency, so
things will be a little slower on the Mac until it gets C++11 libs.
But we're not leaking the thing like we were before.
  • Loading branch information
RussellTaylor committed Sep 18, 2013
1 parent c25a88b commit b49330a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ namespace Mantid

bool m_workspaceInitialized;
std::string m_wsName;
detid2index_map * m_indexMap; // maps pixel id's to workspace indexes
detid2index_map m_indexMap; // maps pixel id's to workspace indexes

// We need these 2 strings to initialize m_buffer
std::string m_instrumentName;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1180,8 +1180,8 @@ namespace LiveData
{
// It'd be nice to use operator[], but we might end up inserting a value....
// Have to use find() instead.
detid2index_map::iterator it = m_indexMap->find( pixelId);
if (it != m_indexMap->end())
detid2index_map::iterator it = m_indexMap.find( pixelId);
if (it != m_indexMap.end())
{
std::size_t workspaceIndex = it->second;
Mantid::DataObjects::TofEvent event( tof, pulseTime);
Expand Down

0 comments on commit b49330a

Please sign in to comment.