diff options
| author | sbw1 <sbw1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-09-13 01:52:38 +0000 |
|---|---|---|
| committer | sbw1 <sbw1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-09-13 01:52:38 +0000 |
| commit | bd052529490084a53defd5e116da1cbb311faa99 (patch) | |
| tree | 59551892a843bf55a6c4eb00b2fc7c345ee4655c | |
| parent | 87d18fc3a0919e51993f0a9c3d830fd8ad8ff06b (diff) | |
| download | ATCD-bd052529490084a53defd5e116da1cbb311faa99.tar.gz | |
TAO_Literal_Constraint has constructors that need to distinguish
between CORBA::Long and CORBA::Boolean parameters. When CORBA::B_FALSE
and CORBA::B_TRUE in the TAO_Literal_Constraint constructors were
changed to 0 and 1, they were interpreted as longs and not booleans.
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/constraint.l | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp index 9cfce4d43de..7572d7eca87 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(1); + new TAO_Literal_Constraint((CORBA::Boolean) 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(0); + new TAO_Literal_Constraint((CORBA::Boolean) 0); TAO_YY_LEX_DEBUG; return TAO_BOOLEAN; } ACE_NOTREACHED (YY_BREAK) diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp index b6bb33643e5..40f38f2992f 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp @@ -32,7 +32,6 @@ TAO_Offer_Database<LOCK_TYPE>::~TAO_Offer_Database (void) ! offer_iter.done (); offer_iter++) { - ACE_DEBUG ((LM_DEBUG, "Deleting an offer.\n")); // Delete all the offers in the offer map. CosTrading::Offer* offer = (*offer_iter).int_id_; delete offer; @@ -107,7 +106,6 @@ remove_offer (const char* type, CORBA::ULong id) return -1; return_value = offer_map_entry->offer_map_->unbind (id, offer); - ACE_DEBUG ((LM_DEBUG, "Deleting an offer.\n")); delete offer; // If the service type has no more offers, free the map, lest diff --git a/TAO/orbsvcs/orbsvcs/Trader/constraint.l b/TAO/orbsvcs/orbsvcs/Trader/constraint.l index ccb3c2f4bce..c4476bacce1 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/constraint.l +++ b/TAO/orbsvcs/orbsvcs/Trader/constraint.l @@ -67,12 +67,12 @@ in { TAO_YY_LEX_DEBUG; return TAO_IN; } ")" { TAO_YY_LEX_DEBUG; return TAO_RPAREN; } TRUE { yylval.constraint_ = - new TAO_Literal_Constraint(CORBA::B_TRUE); + new TAO_Literal_Constraint((CORBA::Boolean) 1); TAO_YY_LEX_DEBUG; return TAO_BOOLEAN; } FALSE { yylval.constraint_ = - new TAO_Literal_Constraint(CORBA::B_FALSE); + new TAO_Literal_Constraint((CORBA::Boolean) 0); TAO_YY_LEX_DEBUG; return TAO_BOOLEAN; } {integer} { |