public:
/** \name Save and restore state. */
//@{
- void SaveState( const ResKind & kind_r );
+ void SaveState( const ResObject::Kind & kind_r );
- void RestoreState( const ResKind & kind_r );
+ void RestoreState( const ResObject::Kind & kind_r );
//@}
///////////////////////////////////////////////////////////////////
// Now diff to the pool collecting names only.
// Thus added and removed locks are not necessarily
// disjoint. Added locks win.
- typedef std::unordered_set<IdString> IdentSet;
+ typedef std::tr1::unordered_set<IdString> IdentSet;
IdentSet addedLocks;
IdentSet removedLocks;
for_( it, begin(), end() )