diff --git a/pdbApp/pdb.cpp b/pdbApp/pdb.cpp index 962795a..ad32107 100644 --- a/pdbApp/pdb.cpp +++ b/pdbApp/pdb.cpp @@ -53,15 +53,10 @@ struct GroupMemberInfo { pvfldname; // PVStructure sub-field std::string structID; // ID to assign to sub-field std::set triggers; // names in GroupInfo::members_names which are post()d on events from pvfldname - p2p::auto_ptr builder; + std::tr1::shared_ptr builder; // not actually shared, but allows us to be copyable bool operator<(const GroupMemberInfo& o) const { - bool LT = pvfldname==".", - RT = o.pvfldname=="."; - if(LT && RT) return false; - else if(LT && !RT) return true; - else if(!LT && RT) return false; - else return pvfldname builder; + std::tr1::shared_ptr builder; FieldName attachment; std::vector triggers; // index in PDBGroupPV::members DBManyLock locker; // lock only those channels being triggered