diff options
author | dengg <dengg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-09-06 16:40:06 +0000 |
---|---|---|
committer | dengg <dengg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-09-06 16:40:06 +0000 |
commit | afb7e039a7b6f472961e41604871ccde39374d9d (patch) | |
tree | 1b03d29e505cf005a7a324379c80488439ba1483 | |
parent | b819cbf2659f42f5b010db369ea34a3302f67022 (diff) | |
download | ATCD-afb7e039a7b6f472961e41604871ccde39374d9d.tar.gz |
*** empty log message ***
3 files changed, 5 insertions, 5 deletions
diff --git a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp index 7f07705f78a..2e143c1c045 100644 --- a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp +++ b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp @@ -88,7 +88,7 @@ init (ACE_ENV_SINGLE_ARG_DECL) if (CIAO::debug_level () > 1) { // The dump() function is broken. - //Deployment::DnC_Dump::dump (artifacts.child_plan_); + //::Deployment::DnC_Dump::dump (artifacts.child_plan_); } // Call preparePlan() method on the NodeManager with the diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/CompImplDesc_Handler_Test.cpp b/TAO/CIAO/DAnCE/tests/Config_Handlers/CompImplDesc_Handler_Test.cpp index ef03b09cec6..1dc800a689c 100644 --- a/TAO/CIAO/DAnCE/tests/Config_Handlers/CompImplDesc_Handler_Test.cpp +++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/CompImplDesc_Handler_Test.cpp @@ -2,15 +2,15 @@ #include "Handler_Test.h" -#ifndef ACE_HAS_BROKEN_NESTED_TEMPLATES +//#ifndef ACE_HAS_BROKEN_NESTED_TEMPLATES #include "Config_Handlers/CompImplDesc_Handler.h" int -ACE_TMAIN (int argc, ACE_TCHAR *argv[]) +main (int argc, ACE_TCHAR *argv[]) { return run_test <CIAO::Config_Handler::CompImplDesc_Handler, Deployment::ComponentImplementationDescription> (argc, argv, &CIAO::Config_Handler::CompImplDesc_Handler::process_ComponentImplementationDescription); } -#endif // ACE_HAS_BROKEN_NESTED_TEMPLATES +//#endif // ACE_HAS_BROKEN_NESTED_TEMPLATES diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/CompPkgDesc_Handler_Test.cpp b/TAO/CIAO/DAnCE/tests/Config_Handlers/CompPkgDesc_Handler_Test.cpp index adf64ee1380..7c17db97c88 100644 --- a/TAO/CIAO/DAnCE/tests/Config_Handlers/CompPkgDesc_Handler_Test.cpp +++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/CompPkgDesc_Handler_Test.cpp @@ -7,7 +7,7 @@ #include "Config_Handlers/CompPkgDesc_Handler.h" int -ACE_TMAIN (int argc, ACE_TCHAR *argv[]) +main (int argc, ACE_TCHAR *argv[]) { return run_test <CIAO::Config_Handler::CompPkgDesc_Handler, Deployment::ComponentPackageDescription> (argc, argv, &CIAO::Config_Handler::CompPkgDesc_Handler::process_ComponentPackageDescription); |