summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/orbsvcs/Log
diff options
context:
space:
mode:
authorwolff1 <wolff1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2009-04-16 00:49:06 +0000
committerwolff1 <wolff1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2009-04-16 00:49:06 +0000
commitd5c3e91779887950d9f5db14f1cd5794ccbfe8f1 (patch)
treec03ef292d4b133e298ced7a64b952f321a7cc3dc /TAO/orbsvcs/orbsvcs/Log
parent11332bf38b806102b1009539d6c159fe34064462 (diff)
downloadATCD-d5c3e91779887950d9f5db14f1cd5794ccbfe8f1.tar.gz
merged in revisions 84573 - 85094 from DOC/Middleware/trunk/TAO
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Log')
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
index 2760bbf711e..cc0788b558a 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
@@ -860,15 +860,18 @@ TAO_Log_Constraint_Visitor::visit_binary_op (
this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
break;
case ETCL_LE:
- result = left_operand <= right_operand;
+ //result = left_operand <= right_operand; // Compile error on LynxOS
+ result = left_operand.operator<= (right_operand);
this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
break;
case ETCL_GT:
- result = left_operand > right_operand;
+ //result = left_operand > right_operand; // Compile error on LynxOS
+ result = left_operand.operator> (right_operand);
this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
break;
case ETCL_GE:
- result = left_operand >= right_operand;
+ //result = left_operand >= right_operand; // Compile error on LynxOS
+ result = left_operand.operator>= (right_operand);
this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
break;
case ETCL_EQ:
@@ -876,7 +879,8 @@ TAO_Log_Constraint_Visitor::visit_binary_op (
this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
break;
case ETCL_NE:
- result = left_operand != right_operand;
+ //result = left_operand != right_operand; // Compile error on LynxOS
+ result = left_operand.operator!= (right_operand);
this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
break;
case ETCL_PLUS: