diff --git a/src/proc/mobject/placement-ref.hpp b/src/proc/mobject/placement-ref.hpp index 19023fd53..d4a77549c 100644 --- a/src/proc/mobject/placement-ref.hpp +++ b/src/proc/mobject/placement-ref.hpp @@ -68,12 +68,12 @@ namespace mobject { /** * TODO type comment */ - template + template class PlacementRef { - typedef Placement PlacementMO; + typedef Placement PlacementMX; typedef Placement::ID _ID; ////TODO: could we define const& here?? - typedef Placement::Id _Id; + typedef Placement::Id _Id; _Id id_; @@ -115,7 +115,7 @@ namespace mobject { } template - PlacementRef (PlacementRef const& r) ///< extended copy ctor, when type X is assignable to MO + PlacementRef (PlacementRef const& r) ///< extended copy ctor, when type X is assignable to MX : id_(recast(r)) { validate(id_); @@ -151,9 +151,9 @@ namespace mobject { /* == forwarding smart-ptr operations == */ - PlacementMO& operator*() const { return access(id_); } ///< dereferencing fetches referred Placement from Index + PlacementMX& operator*() const { return access(id_); } ///< dereferencing fetches referred Placement from Index - PlacementMO& operator->() const { return access(id_); } ///< provide access to pointee API by smart-ptr chaining + PlacementMX& operator->() const { return access(id_); } ///< provide access to pointee API by smart-ptr chaining operator string() const { return access(id_).operator string(); } size_t use_count() const { return access(id_).use_count(); } @@ -210,8 +210,8 @@ namespace mobject { static void validate (_Id const& rId) { - PlacementMO& pRef (access (rId)); - if (!(pRef.template isCompatible())) + PlacementMX& pRef (access (rId)); + if (!(pRef.template isCompatible())) throw lumiera::error::Invalid("actual type of the resolved placement is incompatible",LUMIERA_ERROR_INVALID_PLACEMENTREF); ////////////////////////TODO: 1. better message, including type? @@ -231,13 +231,13 @@ namespace mobject { return reinterpret_cast<_Id const&> (*luid); } - static PlacementMO& + static PlacementMX& access (_Id const& placementID) { Placement & pla (session::SessionServiceFetch::resolveID (placementID)); // may throw REQUIRE (pla.isValid()); - ASSERT (pla.isCompatible()); - return static_cast (pla); + ASSERT (pla.isCompatible()); + return static_cast (pla); } };