Fixed IRIX warnings.

8 files changed, 33 insertions, 34 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
index 5121d86c7da..0185dee5d51 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
@@ -326,8 +326,8 @@ TAO_Lex_String_Input::reset(char* input_string)
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Unbounded_Queue<TAO_Preference_Interpreter::Preference_Info> Ordered_Offers; 
+template class ACE_Unbounded_Queue<TAO_Preference_Interpreter::Preference_Info>
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Unbounded_Queue<TAO_Preference_Interpreter::Preference_Info> Ordered_Offers; 
+#pragma instantiate ACE_Unbounded_Queue<TAO_Preference_Interpreter::Preference_Info>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
index 6d2539ea588..0949a213668 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
@@ -1123,15 +1123,15 @@ template class TAO_Sequence_Extracter<CosTradingSequences::DoubleSeq>;
 template class TAO_Sequence_Extracter<CosTradingSequences::BooleanSeq>;
 template class TAO_Sequence_Extracter<CosTradingSequences::StringSeq>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Hash_Map_Manager<TAO_String_Hash_Key, int, ACE_Null_Mutex>;
-#pragma instantiate ACE_Hash_Map_Manager<TAO_String_Hash_Key, CORBA::TypeCode_ptr, ACE_Null_Mutex>;
-#pragma instantiate ACE_Unbounded_Queue<TAO_Literal_Constraint>;
-#pragma instantiate TAO_Sequence_Extracter<CosTradingSequences::ShortSeq>;
-#pragma instantiate TAO_Sequence_Extracter<CosTradingSequences::UShortSeq>;
-#pragma instantiate TAO_Sequence_Extracter<CosTradingSequences::LongSeq>;
-#pragma instantiate TAO_Sequence_Extracter<CosTradingSequences::ULongSeq>;
-#pragma instantiate TAO_Sequence_Extracter<CosTradingSequences::FloatSeq>;
-#pragma instantiate TAO_Sequence_Extracter<CosTradingSequences::DoubleSeq>;
-#pragma instantiate TAO_Sequence_Extracter<CosTradingSequences::BooleanSeq>;
-#pragma instantiate TAO_Sequence_Extracter<CosTradingSequences::StringSeq>;
+#pragma instantiate ACE_Hash_Map_Manager<TAO_String_Hash_Key, int, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Manager<TAO_String_Hash_Key, CORBA::TypeCode_ptr, ACE_Null_Mutex>
+#pragma instantiate ACE_Unbounded_Queue<TAO_Literal_Constraint>
+#pragma instantiate TAO_Sequence_Extracter<CosTradingSequences::ShortSeq>
+#pragma instantiate TAO_Sequence_Extracter<CosTradingSequences::UShortSeq>
+#pragma instantiate TAO_Sequence_Extracter<CosTradingSequences::LongSeq>
+#pragma instantiate TAO_Sequence_Extracter<CosTradingSequences::ULongSeq>
+#pragma instantiate TAO_Sequence_Extracter<CosTradingSequences::FloatSeq>
+#pragma instantiate TAO_Sequence_Extracter<CosTradingSequences::DoubleSeq>
+#pragma instantiate TAO_Sequence_Extracter<CosTradingSequences::BooleanSeq>
+#pragma instantiate TAO_Sequence_Extracter<CosTradingSequences::StringSeq>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp
index 33da9d69ec1..c6d8feb7c3c 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp
@@ -509,11 +509,11 @@ YY_MALLOC_DECL
 
 /* Copy whatever the last rule matched to the standard output. */
 
-#ifndef ECHO
+#ifndef TAO_TRADER_ECHO
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO (void) fwrite( yytext, yyleng, 1, yyout )
+#define TAO_TRADER_ECHO (void) fwrite( yytext, yyleng, 1, yyout )
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -848,7 +848,7 @@ YY_RULE_SETUP
 case 31:
 YY_RULE_SETUP
 #line 99 "Trader/constraint.l"
-ECHO;
+TAO_TRADER_ECHO;
 	YY_BREAK
 #line 865 "lex.yy.c"
 case YY_STATE_EOF(INITIAL):
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
index c6242f1fbf1..bf1c960c9d6 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
@@ -378,7 +378,7 @@ template class ACE_Unbounded_Queue <CosTrading::Offer*>;
 template class ACE_Unbounded_Queue <CosTrading::OfferIterator*>;
 template class ACE_Unbounded_Queue <CosTrading::OfferId>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Unbounded_Queue <CosTrading::Offer*>;
-#pragma instantiate ACE_Unbounded_Queue <CosTrading::OfferIterator*>;
-#pragma instantiate ACE_Unbounded_Queue <CosTrading::OfferId>;
+#pragma instantiate ACE_Unbounded_Queue <CosTrading::Offer*>
+#pragma instantiate ACE_Unbounded_Queue <CosTrading::OfferIterator*>
+#pragma instantiate ACE_Unbounded_Queue <CosTrading::OfferId>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
index f99d5a597d0..b5454f0e338 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
@@ -533,6 +533,6 @@ update_type_map (const char* name,
 template class ACE_Hash_Map_Manager<TAO_String_Hash_Key, CosTradingRepos::ServiceTypeRepository::PropStruct*, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Manager<TAO_String_Hash_Key, TAO_Service_Type_Repository::Type_Info*, ACE_Null_Mutex>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Hash_Map_Manager<TAO_String_Hash_Key, CosTradingRepos::ServiceTypeRepository::PropStruct*, ACE_Null_Mutex>;
-#pragma instantiate ACE_Hash_Map_Manager<TAO_String_Hash_Key, TAO_Service_Type_Repository::Type_Info*, ACE_Null_Mutex>;
+#pragma instantiate ACE_Hash_Map_Manager<TAO_String_Hash_Key, CosTradingRepos::ServiceTypeRepository::PropStruct*, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Manager<TAO_String_Hash_Key, TAO_Service_Type_Repository::Type_Info*, ACE_Null_Mutex>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
index 57545ec1132..1c6d614562c 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
@@ -876,8 +876,8 @@ ACE_MT (template class TAO_Trader<ACE_Thread_Mutex, ACE_RW_Mutex>);
 template class TAO_Trader<ACE_Null_Mutex, ACE_Null_Mutex>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-#pragma instantiate TAO_Trader<ACE_Thread_Mutex, ACE_RW_Mutex>;
+#pragma instantiate TAO_Trader<ACE_Thread_Mutex, ACE_RW_Mutex>
 #endif /* ACE_MT_SAFE */ 
-#pragma instantiate TAO_Trader<ACE_Null_Mutex, ACE_Null_Mutex>;
+#pragma instantiate TAO_Trader<ACE_Null_Mutex, ACE_Null_Mutex>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.h b/TAO/orbsvcs/orbsvcs/Trader/Trader.h
index 31711a3593e..a60a93b8d0d 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.h
@@ -74,15 +74,17 @@ public:
   // -TSdef_follow_policy {always,if_no_local,local_only}, default is if_no_local,
   // -TSmax_follow_policy {always,if_no_local,local_only}, default is always
 
+protected:
+
+  TAO_Trader_Factory (int& argc, char** argv);
+
 private:
 
   enum Conformance { TAO_TRADER_QUERY,
                      TAO_TRADER_SIMPLE,
                      TAO_TRADER_STANDALONE,
                      TAO_TRADER_LINKED };
-  
-  TAO_Trader_Factory (int& argc, char** argv);
-
+ 
   TAO_TRADER* manufacture_trader (void);
   
   void parse_args (int& argc, char** argv);
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
index 0ddcf45486e..caf38e73a1f 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
@@ -769,9 +769,6 @@ copy_in_follow_option (CosTrading::PolicySeq& policy_seq,
   CosTrading::FollowOption trader_max_follow_policy = 
     this->trader_.import_attributes ().max_follow_policy ();
 
-  CosTrading::FollowOption link_limiting_follow_rule =
-    link_info.limiting_follow_rule;
-  
   if (this->policies_[LINK_FOLLOW_RULE] != 0)
     {
       CORBA::Environment env;
@@ -1225,7 +1222,7 @@ TAO_Offer_Filter::limits_applied (void)
       temp[i++] = CORBA::string_dup ((const char*) *policy_name_ptr);
     }
   
-  return new PolicyNameSeq (size, size, temp, CORBA::B_TRUE);
+  return new CosTrading::PolicyNameSeq (size, size, temp, CORBA::B_TRUE);
 }
 
   // *************************************************************
@@ -1326,8 +1323,8 @@ template class ACE_Hash_Map_Manager<TAO_String_Hash_Key, CosTrading::Property*,
 template class ACE_Unbounded_Set<TAO_String_Hash_Key>;
 template class ACE_Unbounded_Queue<CosTrading::Property*>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Hash_Map_Manager<TAO_String_Hash_Key, int, ACE_Null_Mutex>;
-#pragma instantiate ACE_Hash_Map_Manager<TAO_String_Hash_Key, CosTrading::Property*, ACE_Null_Mutex>;
-#pragma instantiate ACE_Unbounded_Set<TAO_String_Hash_Key>;
-#pragma instantiate ACE_Unbounded_Queue<CosTrading::Property*>;
+#pragma instantiate ACE_Hash_Map_Manager<TAO_String_Hash_Key, int, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Manager<TAO_String_Hash_Key, CosTrading::Property*, ACE_Null_Mutex>
+#pragma instantiate ACE_Unbounded_Set<TAO_String_Hash_Key>
+#pragma instantiate ACE_Unbounded_Queue<CosTrading::Property*>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */