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

Placement: correct handling of ID generation on copy construction

Browse source
This commit is contained in:
Fischlurch 2010-01-08 04:00:14 +01:00
parent 92ad5d1994
commit 36cd34e9b1
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/proc/mobject/placement.hpp
View file

@ -71,7 +71,7 @@
#include "lib/hash-indexed.hpp"
#include "proc/mobject/session/locatingpin.hpp"
#include "proc/asset/pipe.hpp" /////TODO: get rid of this (Trac #109)
#include "proc/asset/pipe.hpp" //////////////TICKET #109 : get rid of this
#include <tr1/memory>
@ -115,15 +115,15 @@ namespace mobject {
*/
template<>
class Placement<MObject,MObject>
: protected shared_ptr<MObject>,
public HashIndexed<Placement<MObject>, lib::hash::LuidH>
: protected shared_ptr<MObject>
, public HashIndexed<Placement<MObject>, lib::hash::LuidH >
{
protected:
typedef HashIndexed<Placement<MObject>, lib::hash::LuidH> HashInd;
typedef shared_ptr<MObject> _SmartPtr;
typedef void (*Deleter)(MObject*);
typedef lumiera::Time Time;
typedef asset::shared_ptr<asset::Pipe> Pipe; ////TODO: get rid of this
typedef asset::shared_ptr<asset::Pipe> Pipe; ////TICKET #109 : get rid of this
@ -175,11 +175,24 @@ namespace mobject {
////////////TICKET #439
Placement (Placement const& ref)
: _SmartPtr (ref)
, HashInd() // creating a new ID!
, chain(ref.chain)
{ }
protected:
Placement (MObject & subject, Deleter killer)
: _SmartPtr (&subject, killer) {};
: _SmartPtr (&subject, killer) { };
friend class session::MObjectFactory;
/////////////////////////////////////////////////////////TICKET #513
// private:
// /** copy assignment prohibited */
// Placement& operator= (Placement const&);
/////////////////////////////////////////////////////////TICKET #513
};