diff options
| author | jai <jai@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-11-04 15:32:47 +0000 |
|---|---|---|
| committer | jai <jai@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-11-04 15:32:47 +0000 |
| commit | 31694514214683e6d121cb50d5f03af9f2e5422d (patch) | |
| tree | a2f2fbb247587cf470066b53fa7b4a74577fa576 | |
| parent | 5df86a40767b96d9365568d9068e0d159c9dc75b (diff) | |
| download | ATCD-31694514214683e6d121cb50d5f03af9f2e5422d.tar.gz | |
Thu Nov 4 09:31:29 2004 Jaiganesh B <jai@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/CIAO/ChangeLog | 12 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/RepositoryManager/Update_Plan.cpp | 6 |
2 files changed, 13 insertions, 5 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index 136652ee59c..2b5de161663 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,7 +1,15 @@ +Thu Nov 4 09:31:29 2004 Jaiganesh B <jai@dre.vanderbilt.edu> + + * DAnCE/RepositoryManager/Update_Plan.cpp: + + Made changes to fix some build warnings. + Thanks to Chad Elliot <elliott_c@ociweb.com> for reporting + this warning. + Wed Nov 3 16:32:54 2004 Jeff Parsons <j.parsons@vanderbilt.edu> * CIDLC/ExecutorMappingGenerator.cpp: - + Added generation of newline before each operation parameter so each one will be on a separate line. It was discovered that the VC 7.1 lexer truncates lines @@ -9,7 +17,7 @@ Wed Nov 3 16:32:54 2004 Jeff Parsons <j.parsons@vanderbilt.edu> Wed Nov 3 22:32:18 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> - * CIDLC/ServantSourceGenerator.cpp (namespace): + * CIDLC/ServantSourceGenerator.cpp (namespace): VC6 error fixes. Grr...! diff --git a/TAO/CIAO/DAnCE/RepositoryManager/Update_Plan.cpp b/TAO/CIAO/DAnCE/RepositoryManager/Update_Plan.cpp index 251252b12b9..9fa5cf18fce 100644 --- a/TAO/CIAO/DAnCE/RepositoryManager/Update_Plan.cpp +++ b/TAO/CIAO/DAnCE/RepositoryManager/Update_Plan.cpp @@ -306,6 +306,7 @@ namespace CIAO InstanceDeploymentDescription &instance) { + int plan_arti_len; int arti_len; CORBA::ULong new_art_length; CORBA::ULong deps_len = pack_iad.dependsOn.length (); @@ -313,7 +314,6 @@ namespace CIAO { ACE_TString dep_name = (const char*)pack_iad.dependsOn[g].name; - int arti_len; if (ref_map.find (dep_name, arti_len) == 0) { @@ -331,7 +331,7 @@ namespace CIAO ImplementationArtifactDescription depends_iad = pack_iad.dependsOn[g]. referencedArtifact; - if (plan_ref_map.find (dep_name, arti_len) != 0) + if (plan_ref_map.find (dep_name, plan_arti_len) != 0) { new_art_length = plan.artifact.length (); plan.artifact.length (new_art_length + 1); @@ -352,7 +352,7 @@ namespace CIAO } else { - new_art_length = arti_len; + new_art_length = plan_arti_len; ref_map.bind ( (const char*)plan.artifact[new_art_length].name, new_art_length); |