diff options
| author | mk1 <mk1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-05-12 21:52:21 +0000 |
|---|---|---|
| committer | mk1 <mk1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-05-12 21:52:21 +0000 |
| commit | a0897d71a18abc3020b324fffdb85d34d302e559 (patch) | |
| tree | b0c2b02955ca967f19d457c89a55ca61f57b5fd6 /TAO | |
| parent | 9ecccfc3d6050c93fb4e4fa39fe11686213859c9 (diff) | |
| download | ATCD-a0897d71a18abc3020b324fffdb85d34d302e559.tar.gz | |
*** empty log message ***
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Locking.h | 9 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Offer_Iterator_Collection.h | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp | 1 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Trader_T.h | 2 |
5 files changed, 2 insertions, 16 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Locking.h b/TAO/orbsvcs/orbsvcs/Trader/Locking.h index 7a583405dc9..2476c0aee25 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Locking.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Locking.h @@ -18,17 +18,8 @@ #ifndef TAO_LOCKING_H #define TAO_LOCKING_H -#if defined (OS_NO_NAMESPACE) -#define queue booga -#endif /* OS_NO_NAMESPACE */ - #include "tao/corba.h" -#if defined (OS_NO_NAMESPACE) -#undef queue -#endif /* OS_NO_NAMESPACE */ - - // Macros for obtaining read/write locks that are // automatically released at the end of scope. // In case of failure, CORBA::SystemException is thrown. diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterator_Collection.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterator_Collection.h index 380422d7d22..33634adbd76 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterator_Collection.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterator_Collection.h @@ -73,7 +73,7 @@ private: // Cached value of the number of elements left in this iterator. }; - typedef deque<Iter_Info> OFFER_ITERS; + typedef list<Iter_Info> OFFER_ITERS; OFFER_ITERS iters_; // The iterator collection. diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp index c53ea9bfed2..6351acb17fe 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp @@ -421,7 +421,6 @@ TAO_Service_Type_Repository CORBA::Environment& _env) TAO_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition)) { - CosTradingRepos::ServiceTypeRepository::PropertyMode mode; // for each super_type for (SUPER_TYPE_MAP::iterator super_map_iterator = super_map.begin (); super_map_iterator != super_map.end (); diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h index eea02dc2f58..7c286268d43 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h @@ -288,8 +288,4 @@ private: // This are temporary functions, until the format of the incarnation number // will be changed in the spec. -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Service_Type_Repository.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - #endif /* TAO_SERVICE_TYPE_REPOSITORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h index cd33e5344e4..00bbc1cfb24 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h @@ -96,7 +96,7 @@ protected: }; #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Trader.cpp" +#include "Trader_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* ACE_TRADER_H */ |