diff options
| author | sbw1 <sbw1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-06-19 19:13:37 +0000 |
|---|---|---|
| committer | sbw1 <sbw1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-06-19 19:13:37 +0000 |
| commit | 4a6ad51c6f4b893fce64973b0f13406e29025bd3 (patch) | |
| tree | bc0625ea99a3c1307fb9d734eaa2cd325a052498 | |
| parent | 53538040959c9d12e9173ebe769abc6672e8c352 (diff) | |
| download | ATCD-4a6ad51c6f4b893fce64973b0f13406e29025bd3.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Constraint_Evaluator.cpp | 18 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Constraint_Evaluator.h | 3 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp | 18 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Trader_T.h | 3 |
4 files changed, 22 insertions, 20 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Evaluator.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Evaluator.cpp index 9dff63bcda1..c9b82a000fc 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Evaluator.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Evaluator.cpp @@ -516,24 +516,6 @@ visit_property(TAO_Property_Constraint* literal) } -template <class SEQ, class OPERAND_TYPE> CORBA::Boolean -TAO_find (SEQ& sequence, const OPERAND_TYPE element) -{ - int length = sequence.length(), - return_value = 0; - - for (int i = 0; i < length; i++) - { - if (sequence[i] == element) - { - return_value = 1; - break; - } - } - - return (CORBA::Boolean) return_value; -} - CORBA::Boolean TAO_find_string (TAO_Sequences::StringSeq& sequence, const char* element) { diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Evaluator.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Evaluator.h index 7a2347e1f7c..41c89e6350c 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Evaluator.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Evaluator.h @@ -17,6 +17,7 @@ #ifndef TAO_CONSTRAINT_EVALUATOR_H #define TAO_CONSTRAINT_EVALUATOR_H +#include "Trader_T.h" #include "Property_Evaluator.h" #include "Constraint_Visitor.h" #include "Constraint_Nodes.h" @@ -168,8 +169,6 @@ private: // The result of a non_boolean operation. }; -template <class SEQ, class OPERAND_TYPE> -CORBA::Boolean TAO_find (SEQ& sequence, const OPERAND_TYPE operand); CORBA::Boolean TAO_find_string (TAO_Sequences::StringSeq& sequence, const char* element); #endif /* CONSTRAINT_EVALUATOR_H */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp index 8b5d44daeb4..7ab33c4fc4b 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp @@ -112,4 +112,22 @@ TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>::lock (void) return this->lock_; } +template <class SEQ, class OPERAND_TYPE> CORBA::Boolean +TAO_find (SEQ& sequence, const OPERAND_TYPE element) +{ + int length = sequence.length(), + return_value = 0; + + for (int i = 0; i < length; i++) + { + if (sequence[i] == element) + { + return_value = 1; + break; + } + } + + return (CORBA::Boolean) return_value; +} + #endif /* TAO_TRADER_C */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h index 67dbd0f147f..c3964a08654 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h @@ -92,6 +92,9 @@ protected: PortableServer::ServantBase* ifs_[5]; }; +template <class SEQ, class OPERAND_TYPE> +CORBA::Boolean TAO_find (SEQ& sequence, const OPERAND_TYPE operand); + #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Trader_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ |