- Timestamp:
- Aug 25, 2013, 9:08:42 PM (11 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/core6 merged: 9552-9554,9556-9574,9577-9579,9585-9593,9596-9612,9626-9662
- Property svn:mergeinfo changed
-
code/trunk/src/modules/objects/triggers/MultiTriggerContainer.cc
r8706 r9667 42 42 { 43 43 44 CreateUnloadableFactory(MultiTriggerContainer);44 RegisterUnloadableClass(MultiTriggerContainer); 45 45 46 46 /** … … 50 50 The creator. 51 51 */ 52 MultiTriggerContainer::MultiTriggerContainer( BaseObject* creator) : BaseObject(creator), originator_(NULL), data_(NULL)52 MultiTriggerContainer::MultiTriggerContainer(Context* context) : BaseObject(context), originator_(NULL), data_(NULL) 53 53 { 54 54 RegisterObject(MultiTriggerContainer); … … 65 65 A pointer to the data that should be sent with the container. 66 66 */ 67 MultiTriggerContainer::MultiTriggerContainer( BaseObject* creator, MultiTrigger* originator, BaseObject* data) : BaseObject(creator), originator_(originator), data_(data)67 MultiTriggerContainer::MultiTriggerContainer(Context* context, MultiTrigger* originator, BaseObject* data) : BaseObject(context), originator_(originator), data_(data) 68 68 { 69 69 RegisterObject(MultiTriggerContainer);
Note: See TracChangeset
for help on using the changeset viewer.