diff options
Diffstat (limited to 'TAO/orbsvcs')
4 files changed, 5 insertions, 9 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp index 9ff92aa6e50..7794ee10956 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp @@ -2,10 +2,6 @@ #include "CosNotify_Initializer.h" -#if ! defined (__ACE_INLINE__) -#include "CosNotify_Initializer.inl" -#endif /* __ACE_INLINE__ */ - ACE_RCSID(Notify, TAO_NS_CosNotify_Initializer, "$id$") #include "Notify_Service.h" diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp index 8c9c313ad13..229e5cd1634 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp @@ -6,7 +6,7 @@ Notify_Structured_Push_Consumer::Notify_Structured_Push_Consumer ( const char* name, CORBA::Short policy, - unsigned int expected, + CORBA::Long expected, CORBA::Long max_events_per_consumer, CORBA::Boolean& done) : name_ (name), diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.h index 6b24113584f..8497b2cf84c 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.h +++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.h @@ -27,7 +27,7 @@ public: Notify_Structured_Push_Consumer ( const char* name, CORBA::Short policy, - unsigned int expected, + CORBA::Long expected, CORBA::Long max_events_per_consumer, CORBA::Boolean& done); @@ -42,9 +42,9 @@ protected: ACE_CString name_; CORBA::Short discard_policy_; - unsigned int expected_; + CORBA::Long expected_; CORBA::Long max_events_per_consumer_; - unsigned int count_; + CORBA::Long count_; CORBA::Boolean& done_; }; diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp index 9d98e24ff94..4463a44ebcb 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp @@ -19,7 +19,7 @@ static const char* ior = "file://supplier.ior"; static CORBA::Short discard_policy = CosNotification::FifoOrder; -static unsigned int expected = 13; +static CORBA::Long expected = 13; CORBA::Long max_events_per_consumer = 10; // ****************************************************************** |