diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2004-09-28 18:41:24 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2004-09-28 18:41:24 +0000 |
| commit | 10f84b7a2a663eb185a5df9388ef8aa0e5d0f66c (patch) | |
| tree | 7a53cefbf001efb7ebe6b5cdb215bfa46383beee | |
| parent | c3d9a94fe43bbae423f688f6fca602c880f74c14 (diff) | |
| download | ATCD-10f84b7a2a663eb185a5df9388ef8aa0e5d0f66c.tar.gz | |
ChangeLogTag:Tue Sep 28 18:38:41 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/CIAO/DAnCE/Config_Handlers/ADD_Handler.cpp | 4 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/Config_Handlers/ADD_Handler.h | 2 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/Config_Handlers/ChangeLog | 10 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/Config_Handlers/MDD_Handler.cpp | 10 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/Config_Handlers/MDD_Handler.h | 2 |
5 files changed, 22 insertions, 6 deletions
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/ADD_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/ADD_Handler.cpp index a40632c6ebd..49e106c815d 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/ADD_Handler.cpp +++ b/TAO/CIAO/DAnCE/Config_Handlers/ADD_Handler.cpp @@ -15,7 +15,7 @@ namespace CIAO { namespace Config_Handlers { - void + bool ADD_Handler::artifact_deployment_descr ( const ArtifactDeploymentDescription &src, Deployment::ArtifactDeploymentDescription &dest, @@ -113,6 +113,8 @@ namespace CIAO src.deployedResource ()); } #endif /* if 0*/ + + return true; } } diff --git a/TAO/CIAO/DAnCE/Config_Handlers/ADD_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/ADD_Handler.h index c3aa08d67ee..51d7eff4dd9 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/ADD_Handler.h +++ b/TAO/CIAO/DAnCE/Config_Handlers/ADD_Handler.h @@ -47,7 +47,7 @@ namespace CIAO class Config_Handlers_Export ADD_Handler { public: - static void artifact_deployment_descr ( + static bool artifact_deployment_descr ( const ArtifactDeploymentDescription& desc, ::Deployment::ArtifactDeploymentDescription &dest, CORBA::ULong l = 0); diff --git a/TAO/CIAO/DAnCE/Config_Handlers/ChangeLog b/TAO/CIAO/DAnCE/Config_Handlers/ChangeLog index dd0b0232800..f3fec86dc9d 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/ChangeLog +++ b/TAO/CIAO/DAnCE/Config_Handlers/ChangeLog @@ -1,3 +1,13 @@ +Tue Sep 28 18:38:41 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * DAnCE/Config_Handlers/ADD_Handler.cpp: + * DAnCE/Config_Handlers/ADD_Handler.h: + * DAnCE/Config_Handlers/MDD_Handler.cpp: + * DAnCE/Config_Handlers/MDD_Handler.h: + + Additional changes to accomodate to population of IDL data + structures. + Tue Sep 28 16:08:56 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> * DAnCE/Config_Handlers/ADD_Handler.cpp: diff --git a/TAO/CIAO/DAnCE/Config_Handlers/MDD_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/MDD_Handler.cpp index e2d3c269c0d..9c01e471134 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/MDD_Handler.cpp +++ b/TAO/CIAO/DAnCE/Config_Handlers/MDD_Handler.cpp @@ -11,7 +11,7 @@ namespace CIAO { namespace Config_Handlers { - void + bool MDD_Handler::mono_deployment_description ( const MonolithicDeploymentDescription& desc, Deployment::MonolithicDeploymentDescription& toconfig) @@ -53,8 +53,10 @@ namespace CIAO tmp); if (!r) - // @@MAJO: What should we do if find_ref fails? - continue; + { + // @@MAJO: What should we do if find_ref fails? + return false; + } CORBA::ULong len = toconfig.artifactRef.length (); @@ -93,6 +95,8 @@ namespace CIAO desc.deployRequirement ()); } #endif /*if 0*/ + + return true; } } diff --git a/TAO/CIAO/DAnCE/Config_Handlers/MDD_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/MDD_Handler.h index d34792baf75..1ec98904b4f 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/MDD_Handler.h +++ b/TAO/CIAO/DAnCE/Config_Handlers/MDD_Handler.h @@ -47,7 +47,7 @@ namespace CIAO class Config_Handlers_Export MDD_Handler { public: - static void mono_deployment_description ( + static bool mono_deployment_description ( const MonolithicDeploymentDescription& desc, Deployment::MonolithicDeploymentDescription& toconfig); }; |