diff options
| author | dengg <dengg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-10-26 16:50:18 +0000 |
|---|---|---|
| committer | dengg <dengg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-10-26 16:50:18 +0000 |
| commit | 8462d99f4fdad1433776539f96f1a9101e6514e7 (patch) | |
| tree | f7e1f3f607ed4bd71f267b4bd53411e192652b34 | |
| parent | ad018384fd8f5ee75d3dda7c45c27c9ed6126bf3 (diff) | |
| download | ATCD-8462d99f4fdad1433776539f96f1a9101e6514e7.tar.gz | |
Merged from CIAO-events-3 branch.
| -rw-r--r-- | modules/CIAO/DAnCE/StaticConfigurator/StaticDAnCEApp.mpc.tmpl | 6 | ||||
| -rw-r--r-- | modules/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp | 12 |
2 files changed, 11 insertions, 7 deletions
diff --git a/modules/CIAO/DAnCE/StaticConfigurator/StaticDAnCEApp.mpc.tmpl b/modules/CIAO/DAnCE/StaticConfigurator/StaticDAnCEApp.mpc.tmpl index 4895dd9a045..d237d09ac20 100644 --- a/modules/CIAO/DAnCE/StaticConfigurator/StaticDAnCEApp.mpc.tmpl +++ b/modules/CIAO/DAnCE/StaticConfigurator/StaticDAnCEApp.mpc.tmpl @@ -1,8 +1,12 @@ // -*- MPC -*- // $Id$ -project(StaticDAnCEApp): ciao_static_dnc_app { +project(StaticDAnCEApp): ciao_component_dnc, iortable { exename = StaticDAnCEApp + requires += exceptions + includes += ../NodeApplicationManager ../NodeManager + libs += NodeManager NodeManager_stub NodeApplicationManager + after += NodeManager NodeManager_stub NodeApplicationManager libs += Hello_Base_DnC_stub libs += Hello_Base_DnC_svnt diff --git a/modules/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp b/modules/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp index a74f5ee377e..b5a496291d8 100644 --- a/modules/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp +++ b/modules/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp @@ -92,7 +92,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) Deployment::ContainerImplementationInfos& impl_infos = node_impl_info[0].impl_infos; - FILE* fp = ACE_OS::fopen ("plan.h", "w"); + FILE* fp = fopen ("plan.h", "w"); CORBA::ULong i,j,num_containers,num_components; num_containers = impl_infos.length (); @@ -126,15 +126,15 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_OS::fprintf (fp, "struct HomeAttributes\n"); ACE_OS::fprintf (fp, "{\n"); - ACE_OS::fprintf (fp, " char const * component_instance_name_;\n"); + ACE_OS::fprintf (fp, " ACE_TString component_instance_name_;\n"); ACE_OS::fprintf (fp, " /// Specify the entrypoint to component executor DLL.\n"); - ACE_OS::fprintf (fp, " char const * executor_entrypt_;\n"); + ACE_OS::fprintf (fp, " ACE_TString executor_entrypt_;\n"); ACE_OS::fprintf (fp, " ::CIAO::HomeFactory executor_fptr_;\n"); ACE_OS::fprintf (fp, " /// Specify the entrypoint to component servant DLL.\n"); - ACE_OS::fprintf (fp, " char const * servant_entrypt_;\n"); + ACE_OS::fprintf (fp, " ACE_TString servant_entrypt_;\n"); ACE_OS::fprintf (fp, " ::CIAO::ServantFactory servant_fptr_;\n"); ACE_OS::fprintf (fp, "};\n"); - ACE_OS::fprintf (fp, "/// Homes\n"); + ACE_OS::fprintf (fp, "//Homes\n"); ACE_OS::fprintf (fp, "HomeAttributes homes_table[]= \n"); ACE_OS::fprintf (fp, "{\n"); @@ -156,7 +156,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } ACE_OS::fprintf (fp, "};\n\n"); - ACE_OS::fclose (fp); + fclose (fp); return 0; } |