diff options
| author | elliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-04-30 12:31:02 +0000 |
|---|---|---|
| committer | elliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-04-30 12:31:02 +0000 |
| commit | fdf973a1e9561a5b04b53ccb4f98e929f9e9a3c6 (patch) | |
| tree | 0918899fe823d8adb5a86c5db91f4bf8e43a1086 /TAO/orbsvcs/orbsvcs/Notify | |
| parent | 52728a087e8dc453923745ad5d85bb1e15c1ce25 (diff) | |
| download | ATCD-fdf973a1e9561a5b04b53ccb4f98e929f9e9a3c6.tar.gz | |
ChangeLogTag: Wed Apr 30 07:26:37 2003 Chad Elliott <elliott_c@ociweb.com>
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Notify')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp | 3 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp | 3 |
4 files changed, 8 insertions, 6 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp index 1a099203d85..f6121d1ef23 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp @@ -272,7 +272,8 @@ TAO_NS_ETCL_Filter::get_all_constraints (ACE_ENV_SINGLE_ARG_DECL) CORBA::INTERNAL ()); ACE_CHECK_RETURN (0); - size_t current_size = this->constraint_expr_list_.current_size (); + CORBA::ULong current_size = ACE_static_cast (CORBA::ULong, + this->constraint_expr_list_.current_size ()); // Create the list that goes out. CosNotifyFilter::ConstraintInfoSeq *infoseq_ptr; diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp index ff3e5ec41eb..d55c3ed787b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp @@ -20,7 +20,7 @@ TAO_NS_EventTypeSeq::TAO_NS_EventTypeSeq (const CosNotification::EventTypeSeq& e void TAO_NS_EventTypeSeq::populate (CosNotification::EventTypeSeq& event_type_seq) const { - event_type_seq.length (this->size ()); + event_type_seq.length (ACE_static_cast (CORBA::ULong, this->size ())); inherited::CONST_ITERATOR iter (*this); @@ -39,10 +39,10 @@ TAO_NS_EventTypeSeq::populate_no_special (CosNotification::EventTypeSeq& event_t if (this->find (special) == 0) { - event_type_seq.length (this->size () - 1); + event_type_seq.length (ACE_static_cast (CORBA::ULong, this->size () - 1)); } else - event_type_seq.length (this->size ()); + event_type_seq.length (ACE_static_cast (CORBA::ULong, this->size ())); inherited::CONST_ITERATOR iter (*this); diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp index 0a85d4cff3a..f6c983d44dd 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp @@ -129,7 +129,7 @@ TAO_NS_FilterAdmin::get_all_filters (ACE_ENV_SINGLE_ARG_DECL) CosNotifyFilter::FilterIDSeq_var list (list_ptr); - list->length (len); + list->length (ACE_static_cast (CORBA::ULong, len)); FILTER_LIST::ITERATOR iter (this->filter_list_); FILTER_LIST::ENTRY *entry; diff --git a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp index 06fa1cf9747..9b30fdefd69 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp @@ -39,7 +39,8 @@ TAO_NS_PropertySeq::populate (CosNotification::PropertySeq_var& prop_seq) PROPERTY_MAP::ITERATOR iterator (this->property_map_); int index = prop_seq->length (); - prop_seq->length (index + this->property_map_.current_size ()); + prop_seq->length (ACE_static_cast (CORBA::ULong, + index + this->property_map_.current_size ())); for (PROPERTY_MAP::ENTRY *entry = 0; iterator.next (entry) != 0; |