From 31694514214683e6d121cb50d5f03af9f2e5422d Mon Sep 17 00:00:00 2001 From: jai Date: Thu, 4 Nov 2004 15:32:47 +0000 Subject: Thu Nov 4 09:31:29 2004 Jaiganesh B --- TAO/CIAO/ChangeLog | 12 ++++++++++-- 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 + + * DAnCE/RepositoryManager/Update_Plan.cpp: + + Made changes to fix some build warnings. + Thanks to Chad Elliot for reporting + this warning. + Wed Nov 3 16:32:54 2004 Jeff Parsons * 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 Wed Nov 3 22:32:18 2004 Balachandran Natarajan - * 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); -- cgit v1.2.1