Fixed g++ warnings/errors.

8 files changed, 19 insertions, 17 deletions

diff --git a/TAO/orbsvcs/Trading_Service/Makefile b/TAO/orbsvcs/Trading_Service/Makefile
index 92fb0fa37ae..b2036942bfd 100644
--- a/TAO/orbsvcs/Trading_Service/Makefile
+++ b/TAO/orbsvcs/Trading_Service/Makefile
@@ -33,8 +33,7 @@ endif
 #TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE
 
 LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG) \
-	-DTAO_HAS_OBJECT_IN_STRUCT_MARSHAL_BUG
+CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
index 84e1910c856..c96d12ec6c2 100644
--- a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
+++ b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
@@ -22,6 +22,9 @@ Trading_Shutdown::Trading_Shutdown (Trading_Service& trader)
 int
 Trading_Shutdown::handle_signal (int signum, siginfo_t* sinfo, ucontext_t* ucon)
 {
+  ACE_UNUSED_ARG (signum);
+  ACE_UNUSED_ARG (sinfo);
+  ACE_UNUSED_ARG (ucon);
   this->trader_.~Trading_Service ();
   exit (0);
   return 0;
diff --git a/TAO/orbsvcs/tests/Trading/Makefile b/TAO/orbsvcs/tests/Trading/Makefile
index 7a61a55ba17..3369d786b7d 100644
--- a/TAO/orbsvcs/tests/Trading/Makefile
+++ b/TAO/orbsvcs/tests/Trading/Makefile
@@ -31,8 +31,7 @@ FILES   = $(IDL_FILES) \
 	  Simple_Dynamic
 
 LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG) \
-	-DTAO_HAS_OBJECT_IN_STRUCT_MARSHAL_BUG
+CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
 
 LSRC    = $(addsuffix .cpp,$(FILES))
 LDLIBS  = -lTTest -lorbsvcs -lTAO
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
index ee4ae0a0e2a..491ec90bf1a 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
@@ -169,18 +169,18 @@ TAO_Offer_Exporter::export_offers_to_all (CORBA::Environment& _env)
                           ACE_static_cast (const char*, link_name_seq[i])));
             }
 
-          CosTrading::Register_ptr remote_reg;
+          CosTrading::Register_var remote_reg;
 #ifdef TAO_HAS_OBJECT_IN_STRUCT_MARSHAL_BUG
           CORBA::ORB_ptr orb = TAO_ORB_Core_instance ()-> orb ();
           CORBA::Object_var obj = orb->string_to_object (link_info->target_reg, TAO_TRY_ENV);
           TAO_CHECK_ENV;
-          remote_reg = CosTrading::Register::_narrow (obj, TAO_TRY_ENV);
+          remote_reg = CosTrading::Register::_narrow (obj.in (), TAO_TRY_ENV);
           TAO_CHECK_ENV;
 #else 
           remote_reg = link_info->target_reg;
 #endif /* TAO_HAS_OBJECT_IN_STRUCT_MARSHAL_BUG */
           
-          this->export_to (remote_reg, _env);
+          this->export_to (remote_reg.in (), _env);
           TAO_CHECK_ENV_RETURN_VOID (_env);
         }
       TAO_CATCHANY
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
index 4dac9013718..1338b9c70a1 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
@@ -88,7 +88,7 @@ TAO_Offer_Importer::perform_directed_queries (CORBA::Environment& _env)
       CORBA::ORB_ptr orb = TAO_ORB_Core_instance ()-> orb ();
       CORBA::Object_var obj = orb->string_to_object (link_info->target, _env);
       TAO_CHECK_ENV_RETURN_VOID (_env);
-      lookup_if = CosTrading::Lookup::_narrow (obj, _env);
+      lookup_if = CosTrading::Lookup::_narrow (obj.in (), _env);
       TAO_CHECK_ENV_RETURN_VOID (_env);
 #else 
       lookup_if = CosTrading::Lookup::_duplicate (link_info->target);
@@ -219,7 +219,7 @@ perform_queries_with_policies (const TAO_Policy_Manager& policies,
                 {
                   ACE_DEBUG ((LM_DEBUG, "%s\n",
                               ACE_static_cast (const char *,
-                                               (*limits_applied_out)[j])));
+                                               limits_applied_out[j])));
                 }
             }
         }
@@ -248,7 +248,7 @@ TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq,
         {
           // Call back to the exported object.
           TAO_Trader_Test::Remote_Output_var remote_output =
-            TAO_Trader_Test::Remote_Output::_narrow (offer_seq[i].reference,
+            TAO_Trader_Test::Remote_Output::_narrow (offer_seq[i].reference.in (),
                                                      TAO_TRY_ENV);
           TAO_CHECK_ENV;
 
@@ -281,7 +281,7 @@ TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq,
 		{
                   // Call back to the exported object.
                   TAO_Trader_Test::Remote_Output_var remote_output =
-                    TAO_Trader_Test::Remote_Output::_narrow (offer_seq[i].reference,
+                    TAO_Trader_Test::Remote_Output::_narrow (offer_seq[i].reference.in (),
                                                              TAO_TRY_ENV);
                   TAO_CHECK_ENV;
 
diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
index d9454d31a08..19637206ba1 100644
--- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
@@ -13,7 +13,7 @@ TAO_Service_Type_Exporter (CosTrading::Lookup_ptr lookup_if,
   TAO_CHECK_ENV_RETURN_VOID (_env);
       
   // Narrow the Service Type Repository.
-  this->repos_ = CosTradingRepos::ServiceTypeRepository::_narrow (obj, _env);
+  this->repos_ = CosTradingRepos::ServiceTypeRepository::_narrow (obj.in (), _env);
   TAO_CHECK_ENV_RETURN_VOID (_env);
 
   // Build the service type descriptions.
@@ -121,7 +121,7 @@ TAO_Service_Type_Exporter::add_all_types_to_all (CORBA::Environment& _env)
           TAO_CHECK_ENV;
 
           CosTrading::Lookup_ptr remote_lookup =
-            CosTrading::Lookup::_narrow (obj, TAO_TRY_ENV);
+            CosTrading::Lookup::_narrow (obj.in (), TAO_TRY_ENV);
           TAO_CHECK_ENV;
 
           remote_repos = remote_lookup->type_repos (TAO_TRY_ENV);
diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.cpp b/TAO/orbsvcs/tests/Trading/TT_Info.cpp
index b70236b3f32..ddc3e0c1296 100644
--- a/TAO/orbsvcs/tests/Trading/TT_Info.cpp
+++ b/TAO/orbsvcs/tests/Trading/TT_Info.cpp
@@ -143,6 +143,7 @@ TT_Info::dump_properties (const CosTrading::PropertySeq& prop_seq,
   
   for (int length = prop_seq.length (), k = 0; k < length; k++)
     {
+      CORBA::ULong length = 0, i= 0;
       CORBA::Any* value = 0;
       CORBA::TypeCode_ptr tc = 0;
       ACE_DEBUG ((LM_DEBUG, "%-15s: ", prop_seq[k].name.in ()));
@@ -176,7 +177,7 @@ TT_Info::dump_properties (const CosTrading::PropertySeq& prop_seq,
 	  TAO_Trader_Test::StringSeq* str_seq;
 	  (*value) >>= str_seq;
 
-	  for (int length = str_seq->length (), i = 0; i < length; i++)
+	  for (length = str_seq->length (), i = 0; i < length; i++)
 	    ACE_DEBUG ((LM_DEBUG, "%s ", (const char *) (*str_seq)[i]));
 
 	  ACE_DEBUG ((LM_DEBUG, "\n"));
@@ -186,7 +187,7 @@ TT_Info::dump_properties (const CosTrading::PropertySeq& prop_seq,
 	  TAO_Trader_Test::ULongSeq* ulong_seq;
 	  (*value) >>= ulong_seq;
 
-	  for (int length = ulong_seq->length (), i = 0; i < length; i++)
+	  for (length = ulong_seq->length (), i = 0; i < length; i++)
 	    ACE_DEBUG ((LM_DEBUG, "%d ", (*ulong_seq)[i]));
 
 	  ACE_DEBUG ((LM_DEBUG, "\n"));
diff --git a/TAO/orbsvcs/tests/Trading/export_test.cpp b/TAO/orbsvcs/tests/Trading/export_test.cpp
index 96ee21e0c66..837f2be60b4 100644
--- a/TAO/orbsvcs/tests/Trading/export_test.cpp
+++ b/TAO/orbsvcs/tests/Trading/export_test.cpp
@@ -60,7 +60,7 @@ main (int argc, char** argv)
             
       // Run the Service Type Exporter tests
       ACE_DEBUG ((LM_DEBUG, "*** Running the Service Type Exporter tests.\n"));
-      TAO_Service_Type_Exporter type_exporter (lookup_if,
+      TAO_Service_Type_Exporter type_exporter (lookup_if.in (),
                                                verbose,
                                                TAO_TRY_ENV);
       TAO_CHECK_ENV;
@@ -96,7 +96,7 @@ main (int argc, char** argv)
 
       // Run the Offer Exporter tests
       ACE_DEBUG ((LM_DEBUG, "*** Running the Offer Exporter tests.\n"));
-      TAO_Offer_Exporter offer_exporter (lookup_if, verbose, TAO_TRY_ENV);
+      TAO_Offer_Exporter offer_exporter (lookup_if.in (), verbose, TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
       // = Test series.