diff options
author | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-08-30 04:31:22 +0000 |
---|---|---|
committer | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-08-30 04:31:22 +0000 |
commit | 6d64069608cb5e29a191ed8d2eb4d7e163aa0290 (patch) | |
tree | 9f02216ea2a0aaf7c1404e4f48dcc9e18cf151a6 /TAO/orbsvcs/orbsvcs | |
parent | e8a745ea70a1df43a209f25c7ecc36a397249c8f (diff) | |
download | ATCD-6d64069608cb5e29a191ed8d2eb4d7e163aa0290.tar.gz |
*** empty log message ***
Diffstat (limited to 'TAO/orbsvcs/orbsvcs')
19 files changed, 157 insertions, 157 deletions
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp index 36a5a02a148..e8ca7506818 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp @@ -383,7 +383,7 @@ TAO_Server_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder, "(%P|%t) Calling TAO_Server_StreamEndPoint::connect" " is not compatible with the spec!" "\n"), - CORBA::B_FALSE); + 0); } // Called by our peer endpoint, requesting us to establish @@ -516,7 +516,7 @@ TAO_Client_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder, flow_spec, env); - TAO_CHECK_ENV_RETURN (env,CORBA::B_FALSE); + TAO_CHECK_ENV_RETURN (env,0); // Make the upcall to the app return this->handle_postconnect (flow_spec); @@ -582,7 +582,7 @@ TAO_Server_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr ini the_spec, env); - TAO_CHECK_ENV_RETURN (env,CORBA::B_FALSE); + TAO_CHECK_ENV_RETURN (env,0); // Make the upcall to the app return this->handle_connection_requested (the_spec, env); @@ -626,7 +626,7 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl, env); TAO_CHECK_ENV_RETURN (env, - CORBA::B_FALSE); + 0); ACE_DEBUG ((LM_DEBUG, "(%P|%t) TAO_VDev::set_peer: my peer is %s\n", @@ -639,7 +639,7 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl, env); TAO_CHECK_ENV_RETURN (env, - CORBA::B_FALSE); + 0); this->streamctrl_ = the_ctrl; this->peer_ = the_peer_dev; @@ -648,7 +648,7 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl, CORBA::String media_ctrl_ior; anyptr = this->peer_->get_property_value ("Related_MediaCtrl", env); - TAO_CHECK_ENV_RETURN (env,CORBA::B_TRUE); + TAO_CHECK_ENV_RETURN (env,1); if (anyptr != 0) { @@ -659,11 +659,11 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl, CORBA::Object_ptr media_ctrl_obj = TAO_ORB_Core_instance ()->orb ()->string_to_object (media_ctrl_ior,env); - TAO_CHECK_ENV_RETURN (env, CORBA::B_FALSE); + TAO_CHECK_ENV_RETURN (env, 0); CORBA::Boolean result = this->set_media_ctrl (media_ctrl_obj,env); - TAO_CHECK_ENV_RETURN (env,CORBA::B_FALSE); + TAO_CHECK_ENV_RETURN (env,0); return result; } @@ -672,7 +672,7 @@ CORBA::Boolean TAO_VDev::set_media_ctrl (CORBA::Object_ptr media_ctrl, CORBA::Environment &env) { - return CORBA::B_TRUE; + return 1; } // @@ Need to throw not-supported exception here diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp index 16e08cd60b8..564cf38b8e3 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp @@ -30,13 +30,13 @@ TAO_AV_Endpoint_Strategy::TAO_AV_Endpoint_Strategy (void) // Destructor. TAO_AV_Endpoint_Strategy::~TAO_AV_Endpoint_Strategy (void) { - if (CORBA::is_nil (this->stream_endpoint_a_) == CORBA::B_FALSE) + if (CORBA::is_nil (this->stream_endpoint_a_) == 0) CORBA::release (this->stream_endpoint_a_); - if (CORBA::is_nil (this->stream_endpoint_b_) == CORBA::B_FALSE) + if (CORBA::is_nil (this->stream_endpoint_b_) == 0) CORBA::release (this->stream_endpoint_b_); - if (CORBA::is_nil (this->stream_endpoint_b_) == CORBA::B_FALSE) + if (CORBA::is_nil (this->stream_endpoint_b_) == 0) CORBA::release (this->vdev_); } @@ -179,7 +179,7 @@ TAO_AV_Endpoint_Process_Strategy::activate (void) int TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (CORBA::Environment &env) { - if (CORBA::is_nil (this->naming_context_.in ()) == CORBA::B_FALSE) + if (CORBA::is_nil (this->naming_context_.in ()) == 0) return 0; CORBA::Object_var naming_obj = diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp index 23284c731a8..a2dcf82c144 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp @@ -71,17 +71,17 @@ CC_Lock::try_lock (CORBA::Environment &_env) if (errno == EBUSY) { lock_held_--; - return CORBA::B_FALSE; + return 0; } else TAO_THROW_RETURN (CORBA::INTERNAL (CORBA::COMPLETED_NO), - CORBA::B_FALSE); + 0); } ACE_DEBUG ((LM_DEBUG, "lock_held_: %i, ", lock_held_)); - return CORBA::B_TRUE; + return 1; } void @@ -179,11 +179,11 @@ CC_Lock::dump(void) // IW X X X // CORBA::Boolean CC_Lock::compatible_[NUMBER_OF_LOCK_MODES][NUMBER_OF_LOCK_MODES] ={ - {CORBA::B_TRUE, CORBA::B_FALSE, CORBA::B_TRUE, CORBA::B_TRUE, CORBA::B_FALSE}, - {CORBA::B_FALSE, CORBA::B_FALSE, CORBA::B_FALSE, CORBA::B_FALSE, CORBA::B_FALSE}, - {CORBA::B_TRUE, CORBA::B_FALSE, CORBA::B_FALSE, CORBA::B_TRUE, CORBA::B_FALSE}, - {CORBA::B_TRUE, CORBA::B_FALSE, CORBA::B_TRUE, CORBA::B_TRUE, CORBA::B_TRUE}, - {CORBA::B_FALSE, CORBA::B_FALSE, CORBA::B_FALSE, CORBA::B_TRUE, CORBA::B_TRUE}}; + {1, 0, 1, 1, 0}, + {0, 0, 0, 0, 0}, + {1, 0, 0, 1, 0}, + {1, 0, 1, 1, 1}, + {0, 0, 0, 1, 1}}; // CC_LockModeterator @@ -228,9 +228,9 @@ CORBA::Boolean CC_LockModeIterator::IsDone(void) { if(current_==CosConcurrencyControl::write) - return CORBA::B_TRUE; + return 1; else - return CORBA::B_FALSE; + return 0; } CosConcurrencyControl::lock_mode diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp index cb30bc97199..191ebc98442 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp @@ -81,10 +81,10 @@ CORBA::Boolean CC_LockSet::compatible (CC_LockModeEnum mr) { for (size_t i = CC_IR; i <= CC_W; i++) if (this->lock_[i] > 0) - if (this->compatible_[i][mr] == CORBA::B_FALSE) - return CORBA::B_FALSE; + if (this->compatible_[i][mr] == 0) + return 0; - return CORBA::B_TRUE; + return 1; } // Locks the lock in the desired mode. Blocks until success. @@ -119,9 +119,9 @@ CC_LockSet::try_lock (CosConcurrencyControl::lock_mode mode, "CC_LockSet::try_lock\n")); if (this->try_lock_i (lm) == 0) - return CORBA::B_FALSE; + return 0; else - return CORBA::B_TRUE; + return 1; } // Converts the enum from the spec to the internally (ordered) @@ -178,7 +178,7 @@ CC_LockSet::unlock (CosConcurrencyControl::lock_mode mode, lock_queue_.dequeue_head (lock_on_queue); - if (compatible (lock_on_queue) == CORBA::B_TRUE) + if (compatible (lock_on_queue) == 1) { if (semaphore_.release () == -1) TAO_THROW (CORBA::INTERNAL (CORBA::COMPLETED_NO)); @@ -240,7 +240,7 @@ CC_LockSet::lock_i (CC_LockModeEnum lm) // If the lock is not compatible with the locks we hold allready or // there is lock requests in the queue we cannot grant the lock and // thus we queue the request. Otherwise update the lock count. - if (compatible (lm) == CORBA::B_FALSE || lock_queue_.size () > 0) + if (compatible (lm) == 0 || lock_queue_.size () > 0) { // Put the lock mode in the queue lock_queue_.enqueue_tail (lm); @@ -260,7 +260,7 @@ CC_LockSet::try_lock_i (CC_LockModeEnum lm) ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mlock_, 1); // If the lock we try is compatible with the locks we hold we just // opdates the count. Otherwise we return false. - if (compatible (lm) == CORBA::B_FALSE) + if (compatible (lm) == 0) { this->dump (); return 0; @@ -285,7 +285,7 @@ CC_LockSet::change_mode_i (CC_LockModeEnum lm_held, lock_[lm_held]--; - if (compatible (lm_new) == CORBA::B_TRUE) + if (compatible (lm_new) == 1) { lock_[lm_new]++; this->dump (); @@ -324,11 +324,11 @@ CC_LockSet::dump (void) } CORBA::Boolean CC_LockSet::compatible_[NUMBER_OF_LOCK_MODES][NUMBER_OF_LOCK_MODES] ={ - {CORBA::B_TRUE, CORBA::B_TRUE, CORBA::B_TRUE, CORBA::B_TRUE, CORBA::B_FALSE}, - {CORBA::B_TRUE, CORBA::B_TRUE, CORBA::B_TRUE, CORBA::B_FALSE, CORBA::B_FALSE}, - {CORBA::B_TRUE, CORBA::B_TRUE, CORBA::B_FALSE, CORBA::B_FALSE, CORBA::B_FALSE}, - {CORBA::B_TRUE, CORBA::B_FALSE, CORBA::B_FALSE, CORBA::B_TRUE, CORBA::B_FALSE}, - {CORBA::B_FALSE, CORBA::B_FALSE, CORBA::B_FALSE, CORBA::B_FALSE, CORBA::B_FALSE}}; + {1, 1, 1, 1, 0}, + {1, 1, 1, 0, 0}, + {1, 1, 0, 0, 0}, + {1, 0, 0, 1, 0}, + {0, 0, 0, 0, 0}}; #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Node<CC_LockModeEnum>; diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp index d5f868ad086..d1c41ef578a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp @@ -1307,8 +1307,8 @@ ACE_ES_Consumer_Module::fill_qos (RtecEventChannelAdmin::ConsumerQOS& c_qos, { ACE_GUARD (ACE_ES_MUTEX, ace_mon, this->lock_); - c_qos.is_gateway = CORBA::B_TRUE; - s_qos.is_gateway = CORBA::B_TRUE; + c_qos.is_gateway = 1; + s_qos.is_gateway = 1; int count = 0; { @@ -3202,8 +3202,8 @@ ACE_ES_Supplier_Module::fill_qos (RtecEventChannelAdmin::ConsumerQOS& c_qos, { ACE_GUARD (ACE_ES_MUTEX, ace_mon, this->lock_); - c_qos.is_gateway = CORBA::B_TRUE; - s_qos.is_gateway = CORBA::B_TRUE; + c_qos.is_gateway = 1; + s_qos.is_gateway = 1; int count = 0; { diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h index f05b06a6957..a73b8e27a59 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h +++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h @@ -180,7 +180,7 @@ public: CONSUMER = 1, SUPPLIER = 2, SHUTDOWN = CONSUMER | SUPPLIER }; - ACE_EventChannel (CORBA::Boolean activate_threads = CORBA::B_TRUE, + ACE_EventChannel (CORBA::Boolean activate_threads = 1, u_long type = ACE_DEFAULT_EVENT_CHANNEL_TYPE, TAO_Module_Factory* factory = 0); // Construction of the given <type>. Check the **_CHANNEL diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp index 9a9dd11f635..d88c19c18cc 100644 --- a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp +++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp @@ -11,7 +11,7 @@ ACE_RCSID(orbsvcs, Event_Utilities, "$Id$") ACE_ConsumerQOS_Factory::ACE_ConsumerQOS_Factory (void) : designator_set_ (0) { - qos_.is_gateway = CORBA::B_FALSE; + qos_.is_gateway = 0; } ACE_ConsumerQOS_Factory::~ACE_ConsumerQOS_Factory (void) @@ -96,7 +96,7 @@ ACE_ConsumerQOS_Factory::debug (const RtecEventChannelAdmin::ConsumerQOS& qos) ACE_SupplierQOS_Factory::ACE_SupplierQOS_Factory (void) { - qos_.is_gateway = CORBA::B_FALSE; + qos_.is_gateway = 0; } int diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp index c0753a92005..5b49d1facfa 100644 --- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp @@ -533,11 +533,11 @@ TAO_PropertySet::define_property (const char *property_name, TAO_THROW (CosPropertyService::InvalidPropertyName()); // Is this type allowed? - if (is_type_allowed (property_value.type ()) != CORBA::B_TRUE) + if (is_type_allowed (property_value.type ()) != 1) TAO_THROW (CosPropertyService::UnsupportedTypeCode()); // Is this property allowed? - if (is_property_allowed (property_name) != CORBA::B_TRUE) + if (is_property_allowed (property_name) != 1) TAO_THROW (CosPropertyService::UnsupportedProperty()); // Try to bind the property. (*normal* mode is used). @@ -602,10 +602,10 @@ TAO_PropertySet::is_type_allowed (CORBA::TypeCode_ptr type) // If the sequence is empty, no constraints. if (this->allowed_property_types_.length () == 0) - return CORBA::B_TRUE; + return 1; // Check in the allowed_property_types sequence. - CORBA::Boolean ret_val = CORBA::B_FALSE; + CORBA::Boolean ret_val = 0; for (size_t ti = 0; ti < this->allowed_property_types_.length (); ti++) @@ -616,8 +616,8 @@ TAO_PropertySet::is_type_allowed (CORBA::TypeCode_ptr type) TAO_TRY_ENV); TAO_CHECK_ENV; - if (ret_val == CORBA::B_TRUE) - return CORBA::B_TRUE; + if (ret_val == 1) + return 1; } TAO_CATCHANY { @@ -639,17 +639,17 @@ TAO_PropertySet::is_property_allowed (const char* property_name) // If the sequence is empty, no constraints. if (this->allowed_property_names_.length() == 0) - return CORBA::B_TRUE; + return 1; // Check in the allowed_property_names. for (size_t ni = 0; ni < this->allowed_property_names_.length (); ni++) if ((const char *) this->allowed_property_names_[ni] == property_name) - return CORBA::B_TRUE; + return 1; // Name not found. - return CORBA::B_FALSE; + return 0; } // Defining a sequence of properties @@ -872,17 +872,17 @@ TAO_PropertySet::get_properties (const CosPropertyService::PropertyNames &proper size_t n = property_names.length (); if (n == 0) - return CORBA::B_FALSE; + return 0; CORBA::Any_ptr any_ptr = 0; ACE_NEW_RETURN (nproperties, CosPropertyService::Properties (n), - CORBA::B_FALSE); + 0); nproperties->length (n); - CORBA::Boolean ret_val = CORBA::B_TRUE; + CORBA::Boolean ret_val = 1; for (size_t i = 0; i < n; i++) { @@ -900,7 +900,7 @@ TAO_PropertySet::get_properties (const CosPropertyService::PropertyNames &proper else { // Invalid name. Ret value is False. - ret_val = CORBA::B_FALSE; + ret_val = 0; // Assign void type to this name in the out parameter. nproperties [i].property_name = @@ -910,9 +910,9 @@ TAO_PropertySet::get_properties (const CosPropertyService::PropertyNames &proper // method, <<= operator doesnot exist yet for this. nproperties [i].property_value.replace (CORBA::_tc_void, 0, - CORBA::B_FALSE, + 0, _env); - TAO_CHECK_ENV_RETURN (_env, CORBA::B_FALSE); + TAO_CHECK_ENV_RETURN (_env, 0); } } @@ -1169,12 +1169,12 @@ TAO_PropertySet::delete_all_properties (CORBA::Environment &_env) // All properties didnt get deleted. TAO_TRY_ENV.print_exception ("delete_all_properties"); - return CORBA::B_FALSE; + return 0; } TAO_ENDTRY; // All properties deleted. - return CORBA::B_TRUE; + return 1; } // Returns TRUE if the property is defined in the PropertySet. @@ -1190,13 +1190,13 @@ TAO_PropertySet::is_property_defined (const char *property_name, CORBA::Environ { ACE_DEBUG ((LM_DEBUG, "find successfull\n")); - return CORBA::B_TRUE; + return 1; } else { ACE_DEBUG ((LM_ERROR, "find failed\n")); - return CORBA::B_FALSE; + return 0; } } @@ -1326,11 +1326,11 @@ TAO_PropertySetDef::define_property_with_mode (const char *property_name, TAO_THROW (CosPropertyService::InvalidPropertyName()); // Is this type allowed? - if (is_type_allowed (property_value.type ()) != CORBA::B_TRUE) + if (is_type_allowed (property_value.type ()) != 1) TAO_THROW (CosPropertyService::UnsupportedTypeCode()); // Is this property allowed? - if (is_property_allowed (property_name) != CORBA::B_TRUE) + if (is_property_allowed (property_name) != 1) TAO_THROW (CosPropertyService::UnsupportedProperty()); // Is this a valid mode. @@ -1543,16 +1543,16 @@ TAO_PropertySetDef::get_property_modes (const CosPropertyService::PropertyNames size_t sequence_length = property_names.length (); if (sequence_length == 0) - return CORBA::B_TRUE; + return 1; // Allocate memory for the out parameter. ACE_NEW_RETURN (property_modes, CosPropertyService::PropertyModes (sequence_length), - CORBA::B_TRUE); + 1); property_modes->length (sequence_length); // Intialize thre return value. - CORBA::Boolean ret = CORBA::B_TRUE; + CORBA::Boolean ret = 1; // Invoking get_property_mode for each name. CosPropertyService::PropertyModeType mode; @@ -1575,7 +1575,7 @@ TAO_PropertySetDef::get_property_modes (const CosPropertyService::PropertyNames TAO_TRY_ENV.print_exception ("Some exception"); // Return value becomes false. - ret = CORBA::B_TRUE; + ret = 1; // Assign this property to the out parameter with undefined // mode. @@ -1817,10 +1817,10 @@ TAO_PropertyNamesIterator::next_one (CORBA::String_out property_name, property_name = CORBA::string_dup (entry_ptr->ext_id_.pname_.in ()); this->iterator_.advance (); - return CORBA::B_TRUE; + return 1; } else - return CORBA::B_FALSE; + return 0; } CORBA::Boolean @@ -1831,11 +1831,11 @@ TAO_PropertyNamesIterator::next_n (CORBA::ULong how_many, CosProperty_Hash_Entry_ptr entry_ptr = 0; if (this->iterator_.next (entry_ptr) == 0 || how_many == 0) - return CORBA::B_FALSE; + return 0; ACE_NEW_RETURN (property_names, CosPropertyService::PropertyNames, - CORBA::B_FALSE); + 0); size_t size = this->iterator_.map ().current_size (); @@ -1848,7 +1848,7 @@ TAO_PropertyNamesIterator::next_n (CORBA::ULong how_many, property_names [ni] = CORBA::string_dup (entry_ptr->ext_id_.pname_.in ()); - return CORBA::B_TRUE; + return 1; } void @@ -1883,12 +1883,12 @@ TAO_PropertiesIterator::next_one (CosPropertyService::Property_out aproperty, aproperty->property_name = entry_ptr->ext_id_.pname_; aproperty->property_value = entry_ptr->int_id_.pvalue_.in (); this->iterator_.advance (); - return CORBA::B_TRUE; + return 1; } else { aproperty = new CosPropertyService::Property; - return CORBA::B_FALSE; + return 0; } } @@ -1900,11 +1900,11 @@ TAO_PropertiesIterator::next_n (CORBA::ULong how_many, CosProperty_Hash_Entry_ptr entry_ptr = 0; if (this->iterator_.next (entry_ptr) == 0 || how_many == 0) - return CORBA::B_FALSE; + return 0; ACE_NEW_RETURN (nproperties, CosPropertyService::Properties, - CORBA::B_FALSE); + 0); size_t size = this->iterator_.map ().current_size (); @@ -1922,7 +1922,7 @@ TAO_PropertiesIterator::next_n (CORBA::ULong how_many, } else break; - return CORBA::B_TRUE; + return 1; } void diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp index be6697f6c36..c96ad8746fa 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp @@ -200,7 +200,7 @@ order_offer (TAO_Constraint_Evaluator& evaluator, pref_info.offer_ = offer; pref_info.offer_id_ = offer_id; - pref_info.evaluated_ = CORBA::B_TRUE; + pref_info.evaluated_ = 1; if (evaluator.evaluate_preference (this->root_, pref_info.value_) == 0) { @@ -231,7 +231,7 @@ order_offer (TAO_Constraint_Evaluator& evaluator, offer_iter.next (current_offer); // Maintain the sorted order in the first partition. - if (current_offer->evaluated_ == CORBA::B_TRUE && + if (current_offer->evaluated_ == 1 && ((expr_type == TAO_MIN && pref_info.value_ > current_offer->value_) || (expr_type == TAO_MAX && @@ -250,7 +250,7 @@ order_offer (TAO_Constraint_Evaluator& evaluator, { // If the evaluation fails, just tack the sucker onto the // end of the queue. - pref_info.evaluated_ = CORBA::B_FALSE; + pref_info.evaluated_ = 0; this->offers_.enqueue_tail (pref_info); } } diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp index c3d85f98375..2015029681d 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp @@ -411,7 +411,7 @@ TAO_Literal_Constraint::operator= (const TAO_Literal_Constraint& co) TAO_Literal_Constraint::operator CORBA::Boolean (void) const { - return (this->type_ == TAO_BOOLEAN) ? this->op_.bool_ : CORBA::B_FALSE; + return (this->type_ == TAO_BOOLEAN) ? this->op_.bool_ : 0; } TAO_Literal_Constraint::operator CORBA::ULong (void) const diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp index 3e6e3aac410..e2c4e5b140a 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp @@ -553,7 +553,7 @@ sequence_does_contain (CORBA::Any* sequence, // sequence. CORBA::Environment env; - CORBA::Boolean return_value = CORBA::B_FALSE; + CORBA::Boolean return_value = 0; CORBA::TypeCode_var type = sequence->type (); CORBA::TCKind sequence_type = TAO_Sequence_Extracter_Base::sequence_type (type.in (), env); @@ -949,7 +949,7 @@ visit_in (TAO_Binary_Constraint* binary_in) if (right_type == TAO_SEQUENCE) { CORBA::Environment env; - CORBA::Boolean types_match = CORBA::B_FALSE; + CORBA::Boolean types_match = 0; CORBA::TCKind seq_type = TAO_Sequence_Extracter_Base::sequence_type (prop_type, env); TAO_CHECK_ENV_RETURN (env, return_value); diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp index c6d8feb7c3c..9cfce4d43de 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp @@ -790,7 +790,7 @@ YY_RULE_SETUP #line 67 "Trader/constraint.l" { yylval.constraint_ = - new TAO_Literal_Constraint(CORBA::B_TRUE); + new TAO_Literal_Constraint(1); TAO_YY_LEX_DEBUG; return TAO_BOOLEAN; } ACE_NOTREACHED (YY_BREAK) @@ -799,7 +799,7 @@ YY_RULE_SETUP #line 72 "Trader/constraint.l" { yylval.constraint_ = - new TAO_Literal_Constraint(CORBA::B_FALSE); + new TAO_Literal_Constraint(0); TAO_YY_LEX_DEBUG; return TAO_BOOLEAN; } ACE_NOTREACHED (YY_BREAK) diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp index efc30da4b51..97dbeeeb7c4 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp @@ -154,14 +154,14 @@ TAO_Offer_Iterator_Collection::next_n (CORBA::ULong n, TAO_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong offers_left = n; - CORBA::Boolean return_value = CORBA::B_TRUE; + CORBA::Boolean return_value = 1; CosTrading::OfferSeq_var out_offers; ACE_NEW_RETURN (offers, CosTrading::OfferSeq, return_value); while (offers_left > 0 && ! this->iters_.is_empty ()) { CORBA::ULong offset = 0; - CORBA::Boolean any_left = CORBA::B_FALSE; + CORBA::Boolean any_left = 0; CosTrading::OfferIterator* iter = 0; this->iters_.dequeue_head (iter); @@ -178,7 +178,7 @@ TAO_Offer_Iterator_Collection::next_n (CORBA::ULong n, TAO_CHECK_ENV; // If we've exhausted this iterator, destroy it. - if (any_left == CORBA::B_FALSE) + if (any_left == 0) { iter->destroy (env); CORBA::release (iter); @@ -202,7 +202,7 @@ TAO_Offer_Iterator_Collection::next_n (CORBA::ULong n, // Determine if we have anything left to offer. if (this->iters_.is_empty ()) - return_value = CORBA::B_FALSE; + return_value = 0; return return_value; } diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp index 7f462b2f5f0..07f01c66d4f 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp @@ -71,7 +71,7 @@ next_n (CORBA::ULong n, CORBA::ULong max_possible_offers_in_sequence = (n < this->offer_ids_.size ()) ? n : this->offer_ids_.size (); - ACE_NEW_RETURN (offers, CosTrading::OfferSeq, CORBA::B_FALSE); + ACE_NEW_RETURN (offers, CosTrading::OfferSeq, 0); offers->length (max_possible_offers_in_sequence); // While there are entries left and we haven't filled <offers> diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp index 87a78899b65..305c31f7d6e 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp @@ -220,7 +220,7 @@ list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes& } return new CosTradingRepos::ServiceTypeRepository:: - ServiceTypeNameSeq (length, i, types, CORBA::B_TRUE); + ServiceTypeNameSeq (length, i, types, 1); } @@ -264,8 +264,8 @@ describe_type (const char * name, CORBA::ULong length = s.props.length (); CosTradingRepos::ServiceTypeRepository::PropStruct* pstructs = - s.props.get_buffer (CORBA::B_FALSE); - descr->props.replace (length, length, pstructs, CORBA::B_FALSE); + s.props.get_buffer (0); + descr->props.replace (length, length, pstructs, 0); return descr; } @@ -333,10 +333,10 @@ mask_type (const char * name, // make sure the type is unmasked. CORBA::Boolean& mask = type_entry->int_id_->type_struct_.masked; - if (mask == CORBA::B_TRUE) + if (mask == 1) TAO_THROW (CosTradingRepos::ServiceTypeRepository::AlreadyMasked (name)); else - mask = CORBA::B_TRUE; + mask = 1; } @@ -362,10 +362,10 @@ unmask_type (const char * name, // make sure the type is masked. CORBA::Boolean& mask = type_entry->int_id_->type_struct_.masked; - if (mask == CORBA::B_FALSE) + if (mask == 0) TAO_THROW (CosTradingRepos::ServiceTypeRepository::AlreadyMasked (name)); else - mask = CORBA::B_FALSE; + mask = 0; } void @@ -582,15 +582,15 @@ update_type_map (const char* name, super_map_iterator++) { Type_Info* super_type_info = (*super_map_iterator).int_id_; - super_type_info->has_subtypes_ = CORBA::B_FALSE; + super_type_info->has_subtypes_ = 0; } // all parameters are valid, create an entry for this service type // in the this->type_map_. type->type_struct_.if_name = if_name; - type->type_struct_.masked = CORBA::B_FALSE; + type->type_struct_.masked = 0; type->type_struct_.incarnation = this->incarnation_; - type->has_subtypes_ = CORBA::B_FALSE; + type->has_subtypes_ = 0; type->type_struct_.super_types = super_types; // Move the prop struct sequences and super type names from the in @@ -600,11 +600,11 @@ update_type_map (const char* name, ACE_const_cast (CosTradingRepos::ServiceTypeRepository::PropStructSeq*, &props); CosTradingRepos::ServiceTypeRepository::PropStruct* psbuf = - pstructs->get_buffer (CORBA::B_TRUE); + pstructs->get_buffer (1); type->type_struct_.props.replace (pslength, pslength, psbuf, - CORBA::B_TRUE); + 1); this->type_map_.bind (type_name, type); } diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp index 6d790f4b98e..716e7536fb6 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp @@ -88,7 +88,7 @@ TAO_Trader_Base::trading_components (void) const CORBA::Boolean TAO_Trader_Base::is_valid_identifier_name (const char* ident) { - int return_value = CORBA::B_FALSE; + int return_value = 0; if (ident == 0) return return_value; @@ -117,9 +117,9 @@ TAO_Trader_Base::is_valid_identifier_name (const char* ident) TAO_Support_Attributes_i:: TAO_Support_Attributes_i (TAO_Lockable &locker) : locker_ (locker), - supports_modifiable_properties_ (CORBA::B_TRUE), - supports_dynamic_properties_ (CORBA::B_TRUE), - supports_proxy_offers_ (CORBA::B_FALSE), + supports_modifiable_properties_ (1), + supports_dynamic_properties_ (1), + supports_proxy_offers_ (0), type_repos_ (CosTrading::TypeRepository::_nil ()), service_type_repos_ (CosTradingRepos::ServiceTypeRepository::_nil ()) { @@ -133,7 +133,7 @@ CORBA::Boolean TAO_Support_Attributes_i::supports_modifiable_properties (void) const { ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), - CORBA::B_FALSE); + 0); return this->supports_modifiable_properties_; } @@ -149,7 +149,7 @@ CORBA::Boolean TAO_Support_Attributes_i::supports_dynamic_properties (void) const { ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), - CORBA::B_FALSE); + 0); return this->supports_dynamic_properties_; } @@ -166,7 +166,7 @@ CORBA::Boolean TAO_Support_Attributes_i::supports_proxy_offers (void) const { ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), - CORBA::B_FALSE); + 0); return this->supports_proxy_offers_; } @@ -640,9 +640,9 @@ TAO_Trader_Factory::create_trader (int& argc, char** argv) TAO_Trader_Factory::TAO_Trader_Factory (int& argc, char** argv) : conformance_ (TAO_TRADER_LINKED), - threadsafe_ (CORBA::B_FALSE), - supports_dynamic_properties_ (CORBA::B_TRUE), - supports_modifiable_properties_ (CORBA::B_TRUE), + threadsafe_ (0), + supports_dynamic_properties_ (1), + supports_modifiable_properties_ (1), def_search_card_ (20), max_search_card_ (50), def_match_card_ (20), @@ -728,7 +728,7 @@ TAO_Trader_Factory::parse_args (int& argc, char** argv) if (ACE_OS::strcmp (current_arg, "-TSthreadsafe") == 0) { arg_shifter.consume_arg (); - this->threadsafe_ = CORBA::B_TRUE; + this->threadsafe_ = 1; } else if (ACE_OS::strcmp (current_arg, "-TSconformance") == 0) { @@ -757,9 +757,9 @@ TAO_Trader_Factory::parse_args (int& argc, char** argv) char* arg_str = arg_shifter.get_current (); if (ACE_OS::strcasecmp (arg_str, "true") == 0) - this->supports_dynamic_properties_ = CORBA::B_TRUE; + this->supports_dynamic_properties_ = 1; else if (ACE_OS::strcasecmp (arg_str, "false") == 0) - this->supports_dynamic_properties_ = CORBA::B_FALSE; + this->supports_dynamic_properties_ = 0; arg_shifter.consume_arg (); } @@ -773,9 +773,9 @@ TAO_Trader_Factory::parse_args (int& argc, char** argv) char* arg_str = arg_shifter.get_current (); if (ACE_OS::strcasecmp (arg_str, "true") == 0) - this->supports_modifiable_properties_ = CORBA::B_TRUE; + this->supports_modifiable_properties_ = 1; else if (ACE_OS::strcasecmp (arg_str, "false") == 0) - this->supports_modifiable_properties_ = CORBA::B_FALSE; + this->supports_modifiable_properties_ = 0; arg_shifter.consume_arg (); } diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp index 2de11bb8ed5..f4ec21c77f4 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp @@ -500,7 +500,7 @@ retrieve_links (TAO_Policies& policies, TAO_THROW_SPEC ((CORBA::SystemException, CosTrading::Lookup::PolicyTypeMismatch)) { - CORBA::Boolean should_follow = CORBA::B_FALSE; + CORBA::Boolean should_follow = 0; CosTrading::FollowOption follow_rule = policies.link_follow_rule (_env); TAO_CHECK_ENV_RETURN (_env, should_follow); @@ -510,7 +510,7 @@ retrieve_links (TAO_Policies& policies, if ((follow_rule == CosTrading::always || (follow_rule == CosTrading::if_no_local && offers_returned == 0)) && policies.hop_count (_env) > 0) - should_follow = CORBA::B_TRUE; + should_follow = 1; if (should_follow) { @@ -520,7 +520,7 @@ retrieve_links (TAO_Policies& policies, this->trader_.trading_components ().link_if (); links = link_if->list_links (_env); - TAO_CHECK_ENV_RETURN (_env, CORBA::B_FALSE); + TAO_CHECK_ENV_RETURN (_env, 0); // Determine which of the links registered with the Link // interface are suitable to follow. @@ -697,7 +697,7 @@ order_merged_sequence (TAO_Preference_Interpreter& pref_inter, CORBA::ULong length = offers.length (); // Grab ownership of the offers already in the target sequence. - CosTrading::Offer* target_buf = offers.get_buffer (CORBA::B_TRUE); + CosTrading::Offer* target_buf = offers.get_buffer (1); // Order the sequence. for (j = 0; j < length; j++) @@ -813,17 +813,17 @@ seen_request_id (TAO_Policies& policies, TAO_THROW_SPEC ((CORBA::SystemException, CosTrading::Lookup::PolicyTypeMismatch)) { - CORBA::Boolean return_value = CORBA::B_FALSE; + CORBA::Boolean return_value = 0; seq = policies.request_id (_env); - TAO_CHECK_ENV_RETURN (_env, CORBA::B_TRUE); + TAO_CHECK_ENV_RETURN (_env, 1); if (seq == 0) { CosTrading::Admin_ptr admin_if = this->trader_.trading_components ().admin_if (); seq = admin_if->request_id_stem (_env); - TAO_CHECK_ENV_RETURN (_env, CORBA::B_TRUE); + TAO_CHECK_ENV_RETURN (_env, 1); } else { @@ -831,13 +831,13 @@ seen_request_id (TAO_Policies& policies, // cases. ACE_NEW_RETURN (seq, CosTrading::Admin::OctetSeq (*seq), - CORBA::B_FALSE); + 0); } if (seq == 0) - TAO_THROW_RETURN (CORBA::NO_MEMORY (CORBA::COMPLETED_NO), CORBA::B_TRUE); + TAO_THROW_RETURN (CORBA::NO_MEMORY (CORBA::COMPLETED_NO), 1); - ACE_GUARD_RETURN (TRADER_LOCK_TYPE, trader_mon, this->lock_, CORBA::B_TRUE); + ACE_GUARD_RETURN (TRADER_LOCK_TYPE, trader_mon, this->lock_, 1); for (Request_Ids::ITERATOR riter (this->request_ids_); ! riter.done (); riter.advance ()) @@ -847,12 +847,12 @@ seen_request_id (TAO_Policies& policies, if (**old_seq == *seq) { - return_value = CORBA::B_TRUE; + return_value = 1; break; } } - if (return_value == CORBA::B_FALSE) + if (return_value == 0) { if (this->request_ids_.size () == IDS_SAVED) { @@ -943,8 +943,8 @@ export (CORBA::Object_ptr reference, // No copying, no memory leaks. CosTrading::PropertySeq* hack_seq = ACE_const_cast (CosTrading::PropertySeq*, &properties); - CosTrading::Property* pbuf = hack_seq->get_buffer (CORBA::B_TRUE); - offer->properties.replace (plength, plength, pbuf, CORBA::B_TRUE); + CosTrading::Property* pbuf = hack_seq->get_buffer (1); + offer->properties.replace (plength, plength, pbuf, 1); offer->reference = reference->_duplicate (reference); // Insert the offer into the underlying type map. @@ -995,7 +995,7 @@ describe (const char *id, // Let the offer_info prop_seq "borrow" the sequence of properties. CORBA::ULong length = offer->properties.length (); CosTrading::Property* prop_buf = offer->properties.get_buffer (); - offer_info->properties.replace (length, length, prop_buf, CORBA::B_FALSE); + offer_info->properties.replace (length, length, prop_buf, 0); return offer_info; } @@ -1562,7 +1562,7 @@ list_offers (CORBA::ULong how_many, id_itr = CosTrading::OfferIdIterator::_nil (); if (how_many > 0) { - if (offer_id_iter->next_n (how_many, ids, _env) == CORBA::B_TRUE) + if (offer_id_iter->next_n (how_many, ids, _env) == 1) { id_itr = offer_id_iter->_this (_env); TAO_CHECK_ENV_RETURN_VOID (_env); @@ -1737,7 +1737,7 @@ TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::list_links (CORBA::Environment& _env) link_seq[i++] = CORBA::string_dup ((*links_iter).ext_id_.in ()); // Return a sequence of the buf names. - return new CosTrading::LinkNameSeq (i, i, link_seq, CORBA::B_TRUE); + return new CosTrading::LinkNameSeq (i, i, link_seq, 1); } template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp index b5bf3c1731d..936adb1bb3a 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp @@ -304,7 +304,7 @@ template <class SEQ_TYPE> CORBA::Boolean TAO_Sequence_Extracter<SEQ_TYPE>:: extract (const CORBA::Any& any_value, SEQ_TYPE *& seq) { - CORBA::Boolean return_value = CORBA::B_FALSE; + CORBA::Boolean return_value = 0; TAO_TRY { @@ -341,7 +341,7 @@ extract (const CORBA::Any& any_value, SEQ_TYPE *& seq) 1, TAO_TRY_ENV); TAO_CHECK_ENV; - return_value = CORBA::B_TRUE; + return_value = 1; } else delete seq; @@ -349,7 +349,7 @@ extract (const CORBA::Any& any_value, SEQ_TYPE *& seq) else { seq = (SEQ_TYPE*) any_value.value (); - return_value = CORBA::B_TRUE; + return_value = 1; } } } @@ -368,14 +368,14 @@ template <class SEQ, class OPERAND_TYPE> CORBA::Boolean TAO_find (const SEQ& sequence, const OPERAND_TYPE element) { int length = sequence.length(); - CORBA::Boolean return_value = CORBA::B_FALSE; + CORBA::Boolean return_value = 0; for (int i = 0; i < length; i++) { OPERAND_TYPE sequence_element = sequence[i]; if (sequence_element == element) { - return_value = CORBA::B_TRUE; + return_value = 1; break; } } diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp index bbde54e4814..0c4eb7d20b3 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp @@ -644,8 +644,8 @@ TAO_Policies::boolean_prop (POLICY_TYPE pol, CORBA::Environment& _env) const TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { - CORBA::Boolean def_value = CORBA::B_TRUE, - return_value = CORBA::B_TRUE; + CORBA::Boolean def_value = 1, + return_value = 1; const TAO_Support_Attributes_i& support_attrs = this->trader_.support_attributes (); @@ -661,7 +661,7 @@ TAO_Policies::boolean_prop (POLICY_TYPE pol, def_value = support_attrs.supports_proxy_offers (); break; case EXACT_TYPE_MATCH: - def_value = CORBA::B_FALSE; + def_value = 0; break; default: break; @@ -679,9 +679,9 @@ TAO_Policies::boolean_prop (POLICY_TYPE pol, else value >>= CORBA::Any::to_boolean (return_value); - if (def_value == CORBA::B_FALSE && + if (def_value == 0 && pol != EXACT_TYPE_MATCH) - return_value = CORBA::B_FALSE; + return_value = 0; } else return_value = def_value; @@ -927,7 +927,7 @@ copy_to_pass (CosTrading::PolicySeq& policy_seq, } } - policy_seq.replace (REQUEST_ID + 1, counter, policy_buffer, CORBA::B_TRUE); + policy_seq.replace (REQUEST_ID + 1, counter, policy_buffer, 1); } @@ -974,7 +974,7 @@ TAO_Policies::copy_to_forward (CosTrading::PolicySeq& policy_seq, CosTrading::TraderName new_name (length - 1, length - 1, buf, - CORBA::B_TRUE); + 1); new_policy.value <<= new_name; counter++; @@ -990,7 +990,7 @@ TAO_Policies::copy_to_forward (CosTrading::PolicySeq& policy_seq, } // Create the new sequence - policy_seq.replace (REQUEST_ID + 1, counter, policy_buffer, CORBA::B_TRUE); + policy_seq.replace (REQUEST_ID + 1, counter, policy_buffer, 1); } // ************************************************************* @@ -1152,8 +1152,8 @@ merge_properties (CosTrading::PropertySeq& modifies, // The properties pass inspection. Claim this memory until it's time // to affect changes. - CosTrading::Property* props_buf = modifies.get_buffer (CORBA::B_TRUE); - this->merge_props_.replace (length, length, props_buf, CORBA::B_TRUE); + CosTrading::Property* props_buf = modifies.get_buffer (1); + this->merge_props_.replace (length, length, props_buf, 1); // Merge these properties with the original set. for (i = 0; i < length; i++) @@ -1185,7 +1185,7 @@ TAO_Offer_Modifier::affect_change (void) CORBA::ULong merge_length = this->merge_props_.length (); // Scrap the existing property sequence and begin a new one CosTrading::Property* prop_buf = - this->offer_->properties.get_buffer (CORBA::B_TRUE); + this->offer_->properties.get_buffer (1); this->offer_->properties.length (total_length); // Copy in the unaffected and modified props into the offer, @@ -1227,7 +1227,7 @@ TAO_Offer_Filter::TAO_Offer_Filter (TAO_Policies& policies, dp_ (policies.use_dynamic_properties (_env)), mod_ (policies.use_modifiable_properties (_env)) { - if (policies.exact_type_match (_env) == CORBA::B_TRUE) + if (policies.exact_type_match (_env) == 1) { TAO_String_Hash_Key exact_match (TAO_Policies::POLICY_NAMES[TAO_Policies::EXACT_TYPE_MATCH]); @@ -1263,7 +1263,7 @@ TAO_Offer_Filter::ok_to_consider (CosTrading::Offer* offer) TAO_Policies::POLICY_NAMES[TAO_Policies::USE_MODIFIABLE_PROPERTIES]; TAO_String_Hash_Key use_dyns = TAO_Policies::POLICY_NAMES[TAO_Policies::USE_DYNAMIC_PROPERTIES]; - CORBA::Boolean return_value = CORBA::B_TRUE; + CORBA::Boolean return_value = 1; TAO_Property_Evaluator prop_eval (*offer); // If we should screen offers, determine if this offer is unworthy @@ -1375,7 +1375,7 @@ TAO_Offer_Filter::limits_applied (void) temp[i++] = CORBA::string_dup ((const char*) *policy_name_ptr); } - return new CosTrading::PolicyNameSeq (size, size, temp, CORBA::B_TRUE); + return new CosTrading::PolicyNameSeq (size, size, temp, 1); } // ************************************************************* @@ -1471,8 +1471,8 @@ TAO_Property_Filter::filter_offer (CosTrading::Offer* source, } else if (this->policy_ == CosTrading::Lookup::all) { - CosTrading::Property* props = s_props.get_buffer (CORBA::B_FALSE); - d_props.replace (length, length, props, CORBA::B_FALSE); + CosTrading::Property* props = s_props.get_buffer (0); + d_props.replace (length, length, props, 0); } } |