Kaydet (Commit) 4cf326dd authored tarafından Caolán McNamara's avatar Caolán McNamara

attempt to compare a singular iterator to a singular iterator

falls over during build with debug stl

Change-Id: Id7241e1275067f827e4a663eb901c41e4c9873f5
üst fd1372ba
...@@ -250,8 +250,17 @@ class MergeDataHashMap ...@@ -250,8 +250,17 @@ class MergeDataHashMap
typedef std::unordered_map<OString, MergeData*, OStringHash> HashMap_t; typedef std::unordered_map<OString, MergeData*, OStringHash> HashMap_t;
public: public:
MergeDataHashMap():bFirstSearch(true){}; MergeDataHashMap()
~MergeDataHashMap(){}; : bFirstSearch(true)
, aLastInsertion(m_aHashMap.end())
, aLastFound(m_aHashMap.end())
, aFirstInOrder(m_aHashMap.end())
{
}
~MergeDataHashMap()
{
}
typedef HashMap_t::iterator iterator; typedef HashMap_t::iterator iterator;
typedef HashMap_t::const_iterator const_iterator; typedef HashMap_t::const_iterator const_iterator;
...@@ -267,10 +276,10 @@ class MergeDataHashMap ...@@ -267,10 +276,10 @@ class MergeDataHashMap
private: private:
bool bFirstSearch; bool bFirstSearch;
HashMap_t m_aHashMap;
iterator aLastInsertion; iterator aLastInsertion;
iterator aLastFound; iterator aLastFound;
iterator aFirstInOrder; iterator aFirstInOrder;
HashMap_t m_aHashMap;
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment