diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-12-04 12:16:23 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-12-04 12:16:23 +0000 |
| commit | dd1cec961422d683dfb7d7a3d324d974e2961198 (patch) | |
| tree | 05adb70092a1a9bc9d3b45cfa06bdd3608c51f08 | |
| parent | 96f034f8332bad58db05b5988f46d38c13bad9ab (diff) | |
| download | ATCD-dd1cec961422d683dfb7d7a3d324d974e2961198.tar.gz | |
Mon Dec 4 12:16:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | CIAO/ChangeLog | 8 | ||||
| -rw-r--r-- | CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp | 6 | ||||
| -rw-r--r-- | CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc | 1 |
3 files changed, 10 insertions, 5 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 6ace96098ff..28683edcfd2 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,11 @@ +Mon Dec 4 12:16:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp: + Use include from CIAO_ROOT and removed using namespace + + * DAnCE/StaticConfigurator/StaticDAnCEParser.mpc: + Simplified this file + Mon Dec 4 11:41:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * DAnCE/ExecutionManager/ExecutionManager.mpc: diff --git a/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp b/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp index 7335d9b8e03..b2499812711 100644 --- a/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp +++ b/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp @@ -16,7 +16,7 @@ */ //============================================================================= -#include "NodeApplicationManager/ImplementationInfo.h" +#include "DAnCE/NodeApplicationManager/ImplementationInfo.h" #include "ace/OS_NS_stdio.h" #include "ace/streams.h" #include "ace/Get_Opt.h" @@ -24,8 +24,6 @@ #include "tao/CDR.h" #include "Config_Handlers/XML_File_Intf.h" -using namespace CIAO; - static void usage (const ACE_TCHAR* program) { @@ -77,7 +75,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ::Deployment::ComponentPlans dummy; dummy.length (0); - NodeImplementationInfoHandler handler (plan, dummy); + CIAO::NodeImplementationInfoHandler handler (plan, dummy); Deployment::NodeImplementationInfo_var node_impl_info (handler.node_impl_info ()); diff --git a/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc b/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc index 2c05d555416..1234b0a03bb 100644 --- a/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc +++ b/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc @@ -3,7 +3,6 @@ project(StaticDAnCEParser): ciao_component_dnc, taoexe, ciao_config_handlers, ciao_domainapplicationmanager_dnc, iortable, ciao_server_dnc, ciao_nodeapplicationmanager { exename = StaticDAnCEParser - includes += .. Source_Files { StaticDAnCEParser.cpp |