diff options
Diffstat (limited to 'TAO/orbsvcs')
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp | 2 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp index 520709eff1d..3befe5193ec 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp @@ -9,6 +9,8 @@ #include "orbsvcs/Notify/PropertySeq.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" + TAO_BEGIN_VERSIONED_NAMESPACE_DECL /*****************************************************************************/ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp index 67941639ea2..6aa02a42676 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp @@ -205,7 +205,7 @@ lookup_one_type (const char* type, // @@ Would have used Offer_Database::offer_iterator for less // coupling between TAO_Lookup and Offer_Database, but g++ barfs on // that. -#if defined(_MSC_VER) +#if defined(_MSC_VER) && !defined (ACE_HAS_CPP20) TAO_Offer_Database<MAP_LOCK_TYPE>::offer_iterator offer_iter (type, offer_database); #else @@ -958,7 +958,7 @@ withdraw_using_constraint (const char *type, // Try to find the map of offers of desired service type. // @@ Again, should be Offer_Database::offer_iterator { -#if defined (_MSC_VER) +#if defined (_MSC_VER) && !defined (ACE_HAS_CPP20) TAO_Offer_Database<MAP_LOCK_TYPE>::offer_iterator offer_iter (type, offer_database); #else |