ichthyo/LUMIERA.clone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add equality comparison to the HashIndexed (mixin base)

Browse source
This commit is contained in:
Fischlurch 2010-01-08 03:56:21 +01:00
parent 6196c41daa
commit 8c7894943c
2 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/lib/hash-indexed.hpp
View file

@ -42,6 +42,7 @@
** for the generic ID.
** - providing a Mixin, which allows any hierarchy to use this facility without
** much code duplication, including an adapter for tr1::unordered_map
** - equality comparison
**
** @see HashIndexed_test
** @see Placement usage example
@ -187,6 +188,11 @@ namespace lib {
this->id_ = ref.getID();
}
/** equality comparison delegated to the ID implementation */
friend bool operator== (HashIndexed const& hal, HashIndexed const& har) { return hal.id_==har.id_; }
friend bool operator!= (HashIndexed const& hal, HashIndexed const& har) { return hal.id_!=har.id_; }
protected:
HashIndexed () : id_() {}
HashIndexed (IMP const& iref) : id_(iref) {}

18
src/proc/mobject/session/scope.hpp
View file

@ -32,7 +32,7 @@
#include "lib/error.hpp"
//#include "lib/singleton.hpp"
#include <boost/operators.hpp>
//#include <boost/operators.hpp>
//#include <boost/scoped_ptr.hpp>
//#include <tr1/memory>
//#include <vector>
@ -58,9 +58,6 @@ namespace session {
* maintains the current focus location.
*/
class Scope
: public boost::equality_comparable<Scope
, boost::equality_comparable<Scope, PlacementMO> >
{
RefPlacement anchor_;
@ -85,7 +82,7 @@ namespace session {
iterator ascend() const;
friend bool operator== (Scope const&, Scope const&);
friend bool operator== (Scope const&, PlacementMO const&);
friend bool operator!= (Scope const&, Scope const&);
};
@ -95,10 +92,6 @@ namespace session {
/** as scopes are constituted by a "scope top" element (placement)
* registered within the PlacementIndex of the current session,
* equality is defined in terms of this defining placement.
* Moreover, in this context, \em identity relates to
* being the same thing, when used in the context
* of the session. Thus, it can be reduced
* to comparing the Placement-IDs
*/
inline bool
operator== (Scope const& scope1, Scope const& scope2)
@ -107,12 +100,9 @@ namespace session {
}
inline bool
operator== (Scope const& scope, PlacementMO const& aScopeTop)
operator!= (Scope const& scope1, Scope const& scope2)
{
typedef PlacementMO::ID const& PlacementID;
PlacementID id1 = static_cast<PlacementID> (scope.anchor_);
return id1 == aScopeTop.getID();
return scope1.anchor_ != scope2.anchor_;
}