Update of /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv7080/src/templates/CppLocalTemplates
Modified Files:
Tag: RELEASE-0_8-BRANCH
MComponentDef MHomeDef
Log Message:
hack for Itanium (from version 0.6.16)
Index: MHomeDef
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates/MHomeDef,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -C2 -d -r1.24 -r1.24.2.1
*** MHomeDef 17 Jan 2007 17:47:09 -0000 1.24
--- MHomeDef 23 May 2007 16:08:27 -0000 1.24.2.1
***************
*** 24,27 ****
--- 24,31 ----
#include "%(ComponentType)s_gen.h"
+ // BEGIN-HACK: Itanium
+ #include <%(HomeInclude)s_impl.h>
+ // END-HACK: Itanium
+
%(OpenNamespace)s
***************
*** 89,93 ****
protected:
! %(LocalNamespace)sCCM_%(Identifier)s* local_home;
::Components::AssemblyFactory::SmartPtr assembly_factory;
--- 93,100 ----
protected:
! // BEGIN-HACK: Itanium
! %(LocalNamespace)s%(Identifier)s_impl* local_home;
! // END-HACK: Itanium
!
::Components::AssemblyFactory::SmartPtr assembly_factory;
***************
*** 145,150 ****
%(Identifier)s::%(Identifier)s()
{
! local_home = dynamic_cast< %(LocalNamespace)sCCM_%(Identifier)s*>(
create_%(AbsoluteLocalHomeName)s());
assembly_factory = ::Components::AssemblyFactory::SmartPtr();
}
--- 152,159 ----
%(Identifier)s::%(Identifier)s()
{
! // BEGIN-HACK: Itanium
! local_home = dynamic_cast< %(LocalNamespace)s%(Identifier)s_impl*>(
create_%(AbsoluteLocalHomeName)s());
+ // END-HACK: Itanium
assembly_factory = ::Components::AssemblyFactory::SmartPtr();
}
***************
*** 153,158 ****
: assembly_factory(f)
{
! local_home = dynamic_cast< %(LocalNamespace)sCCM_%(Identifier)s*>(
create_%(AbsoluteLocalHomeName)s());
}
--- 162,169 ----
: assembly_factory(f)
{
! // BEGIN-HACK: Itanium
! local_home = dynamic_cast< %(LocalNamespace)s%(Identifier)s_impl*>(
create_%(AbsoluteLocalHomeName)s());
+ // END-HACK: Itanium
}
Index: MComponentDef
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates/MComponentDef,v
retrieving revision 1.23
retrieving revision 1.23.2.1
diff -C2 -d -r1.23 -r1.23.2.1
*** MComponentDef 5 Jan 2007 14:17:24 -0000 1.23
--- MComponentDef 23 May 2007 16:08:27 -0000 1.23.2.1
***************
*** 30,33 ****
--- 30,37 ----
%(BaseInclude)s
+ // BEGIN-HACK: Itanium
+ #include <%(ComponentInclude)s_impl.h>
+ // END-HACK: Itanium
+
%(OpenNamespace)s
***************
*** 91,95 ****
protected:
%(HomeType)s* home_local_adapter;
! %(LocalNamespace)sCCM_%(Identifier)s* local_component;
%(LocalNamespace)sCCM_%(Identifier)s_Context* context;
::Components::Assembly::SmartPtr assembly;
--- 95,102 ----
protected:
%(HomeType)s* home_local_adapter;
! // BEGIN-HACK: Itanium
! %(LocalNamespace)s%(Identifier)s_impl* local_component;
! // END-HACK: Itanium
!
%(LocalNamespace)sCCM_%(Identifier)s_Context* context;
::Components::Assembly::SmartPtr assembly;
***************
*** 172,176 ****
%(LocalNamespace)sCCM_%(Identifier)s* lc, ::Components::Assembly::SmartPtr a)
: %(MSupportsDefAdapterConstructor)s
! home_local_adapter(h), local_component(lc), assembly(a)
{
context = NULL;
--- 179,187 ----
%(LocalNamespace)sCCM_%(Identifier)s* lc, ::Components::Assembly::SmartPtr a)
: %(MSupportsDefAdapterConstructor)s
! home_local_adapter(h),
! // BEGIN-HACK: Itanium
! local_component(dynamic_cast< %(LocalNamespace)s%(Identifier)s_impl*>(lc)),
! // END-HACK: Itanium
! assembly(a)
{
context = NULL;
|
