Update of /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv30263/src/templates/CppLocalTemplates
Modified Files:
MComponentDef MUsesDefAdapterDefinition
MUsesDefAdapterDefinitionMultiple
MUsesDefConnectionMapMultiple
Log Message:
new prototype
Index: MUsesDefAdapterDefinition
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates/MUsesDefAdapterDefinition,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** MUsesDefAdapterDefinition 1 Mar 2007 15:55:19 -0000 1.13
--- MUsesDefAdapterDefinition 5 Mar 2007 09:21:21 -0000 1.14
***************
*** 26,30 ****
throw ::Components::NoConnection();
}
! local_component->disconnect("%(Identifier)s");
%(UsesType)s::SmartPtr f = %(Identifier)s_receptacle;
%(Identifier)s_receptacle.forget();
--- 26,30 ----
throw ::Components::NoConnection();
}
! // local_component->disconnect("%(Identifier)s");
%(UsesType)s::SmartPtr f = %(Identifier)s_receptacle;
%(Identifier)s_receptacle.forget();
Index: MUsesDefConnectionMapMultiple
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates/MUsesDefConnectionMapMultiple,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** MUsesDefConnectionMapMultiple 1 Mar 2007 15:55:19 -0000 1.8
--- MUsesDefConnectionMapMultiple 5 Mar 2007 09:21:21 -0000 1.9
***************
*** 1,4 ****
typedef std::map< ::Components::Cookie,
! %(CCMUsesType)s::SmartPtr> %(MultipleReceptacleType)s;
--- 1,4 ----
typedef std::map< ::Components::Cookie,
! %(UsesType)s::SmartPtr> %(MultipleReceptacleType)s;
Index: MComponentDef
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates/MComponentDef,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** MComponentDef 1 Mar 2007 15:55:19 -0000 1.27
--- MComponentDef 5 Mar 2007 09:21:21 -0000 1.28
***************
*** 360,365 ****
virtual ~CCM_%(Identifier)s() {}
- virtual void disconnect(const std::string& receptacle) = 0;
-
%(MAttributeDefPrototypeVV)s
%(MProvidesDefGetFacetPrototypeVV)s
--- 360,363 ----
***************
*** 424,428 ****
**/
class %(Identifier)s_impl
! : virtual public %(LocalNamespace)sCCM_%(Identifier)s%(BaseType)s
{
private:
--- 422,426 ----
**/
class %(Identifier)s_impl
! : virtual public %(LocalNamespace)sCCM_%(Identifier)s%(BaseType)s%(AssemblyImplBase)s
{
private:
***************
*** 438,441 ****
--- 436,440 ----
virtual ~%(Identifier)s_impl();
+ %(AssemblyImplPrototype)s
%(MAttributeDefPrototype)s
%(MProvidesDefGetFacetPrototype)s
***************
*** 455,460 ****
virtual void ccm_remove()
throw(Components::CCMException);
-
- virtual void disconnect(const std::string& receptacle);
};
--- 454,457 ----
***************
*** 543,552 ****
}
! void
! %(Identifier)s_impl::disconnect(const std::string& receptacle)
! {
! %(AssemblyDisconnect)s
! }
!
%(MProvidesDefGetFacetDefinition)s
--- 540,544 ----
}
! %(AssemblyImplDefinition)s
%(MProvidesDefGetFacetDefinition)s
Index: MUsesDefAdapterDefinitionMultiple
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates/MUsesDefAdapterDefinitionMultiple,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** MUsesDefAdapterDefinitionMultiple 1 Mar 2007 15:55:19 -0000 1.13
--- MUsesDefAdapterDefinitionMultiple 5 Mar 2007 09:21:21 -0000 1.14
***************
*** 10,15 ****
s << "CCM_%(Identifier)s:" << %(Identifier)s_receptacle_counter++;
::Components::Cookie ck(s.str());
! %(CCMUsesType)s::SmartPtr ccmf(dynamic_cast< %(CCMUsesType)s* >(f.ptr()));
! %(Identifier)s_receptacles.insert(make_pair(ck, ccmf));
return ck;
}
--- 10,14 ----
s << "CCM_%(Identifier)s:" << %(Identifier)s_receptacle_counter++;
::Components::Cookie ck(s.str());
! %(Identifier)s_receptacles.insert(make_pair(ck, f));
return ck;
}
***************
*** 25,29 ****
if(%(Identifier)s_receptacles.find(ck) != %(Identifier)s_receptacles.end())
{
! %(CCMUsesType)s::SmartPtr f(%(Identifier)s_receptacles[ck]);
%(Identifier)s_receptacles.erase(ck);
return f;
--- 24,28 ----
if(%(Identifier)s_receptacles.find(ck) != %(Identifier)s_receptacles.end())
{
! %(UsesType)s::SmartPtr f(%(Identifier)s_receptacles[ck]);
%(Identifier)s_receptacles.erase(ck);
return f;
|
