From 5833fce190ec23aa49256ec4a9d49869d13ab796 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 29 May 2013 19:27:25 +0000 Subject: Wed May 29 19:27:35 UTC 2013 Johnny Willemsen * orbsvcs/tests/Trading/Offer_Exporter.cpp: * orbsvcs/tests/Trading/Service_Type_Exporter.cpp: Attempt to fix windows warnings --- TAO/ChangeLog | 6 ++++++ TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp | 12 +++++++----- TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 95276c6f667..216e6d3994f 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Wed May 29 19:27:35 UTC 2013 Johnny Willemsen + + * orbsvcs/tests/Trading/Offer_Exporter.cpp: + * orbsvcs/tests/Trading/Service_Type_Exporter.cpp: + Attempt to fix windows warnings + Wed May 29 13:44:23 UTC 2013 Johnny Willemsen * tao/Bounded_Basic_String_Sequence_T.h: diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp index 2ae8d3b4c9d..273e74a2f94 100644 --- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp +++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp @@ -319,12 +319,14 @@ TAO_Offer_Exporter::grab_offerids (void) offer_id_seq_remaining.out()); // Grow our result sequence with the remaining fragments. - int offers = offer_id_seq_remaining->length (); - int old_length = offer_id_seq_result->length (); + CORBA::ULong offers = offer_id_seq_remaining->length (); + CORBA::ULong old_length = offer_id_seq_result->length (); offer_id_seq_result->length (old_length + offers); - for (int i = 0; i < offers; i++) - offer_id_seq_result[i + old_length] = offer_id_seq_remaining[i]; + for (CORBA::ULong i = 0; i < offers; i++) + { + offer_id_seq_result[i + old_length] = CORBA::string_dup (offer_id_seq_remaining[i].in ()); + } } while (any_left); @@ -335,7 +337,7 @@ TAO_Offer_Exporter::grab_offerids (void) if (this->verbose_) { ACE_DEBUG ((LM_DEBUG, "The following offer ids are registered:\n")); - for (unsigned int i=0; ilength(); i++) + for (CORBA::ULong i=0; ilength(); i++) ACE_DEBUG ((LM_DEBUG, "Offer Id: %C\n", offer_id_seq_result[i].in())); } } diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp index c4b3b0700a8..86272281d1b 100644 --- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp +++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp @@ -24,7 +24,7 @@ TAO_Service_Type_Exporter::~TAO_Service_Type_Exporter (void) { this->remove_all_types (); } - catch (const CORBA::Exception& exp) + catch (const CORBA::Exception&) { }; } -- cgit v1.2.1