diff options
| author | zhangw <zhangw@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-02-12 20:17:45 +0000 |
|---|---|---|
| committer | zhangw <zhangw@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-02-12 20:17:45 +0000 |
| commit | 684f34138cd90379d946da4f040419952b7114f1 (patch) | |
| tree | f1fa3e4e2a0b30791f65738625f0778d0cbf41a9 | |
| parent | 39ab0a14b82dbd6a52aeb3bb5982d397dec2bf0f (diff) | |
| download | ATCD-684f34138cd90379d946da4f040419952b7114f1.tar.gz | |
Mon Feb 12 20:15:22 UTC 2007 Wallace Zhang <zhang_w@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp | 10 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp | 10 |
3 files changed, 18 insertions, 10 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 456539c9f95..bfe8155d031 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Mon Feb 12 20:15:22 UTC 2007 Wallace Zhang <zhang_w@ociweb.com> + + * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp: + * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp: + + Trying to fix a compiler warning for VxWorks5.5.1_x86_GCC2.96_Exceptions + build on DOC group scoreboard. + Mon Feb 12 19:51:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> * orbsvcs/orbsvcs/AV/AVStreams_i.cpp: diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp index 0bb2b4209fb..a091e2c1da4 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp @@ -965,23 +965,23 @@ TAO_Log_Constraint_Visitor::visit_in ( switch (kind) { case CORBA::tk_sequence: - result = this->sequence_does_contain (component, + result = this->sequence_does_contain (&component.in (), left); break; case CORBA::tk_array: - result = this->array_does_contain (component, + result = this->array_does_contain (&component.in (), left); break; case CORBA::tk_struct: - result = this->struct_does_contain (component, + result = this->struct_does_contain (&component.in (), left); break; case CORBA::tk_union: - result = this->union_does_contain (component, + result = this->union_does_contain (&component.in (), left); break; case CORBA::tk_any: - result = this->any_does_contain (component, + result = this->any_does_contain (&component.in (), left); break; default: diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp index 825c8df5045..d1df620ca56 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp @@ -1109,23 +1109,23 @@ TAO_Notify_Constraint_Visitor::visit_in (TAO_ETCL_Binary_Expr *binary) switch (kind) { case CORBA::tk_sequence: - result = this->sequence_does_contain (component, + result = this->sequence_does_contain (&component.in (), left); break; case CORBA::tk_array: - result = this->array_does_contain (component, + result = this->array_does_contain (&component.in (), left); break; case CORBA::tk_struct: - result = this->struct_does_contain (component, + result = this->struct_does_contain (&component.in (), left); break; case CORBA::tk_union: - result = this->union_does_contain (component, + result = this->union_does_contain (&component.in (), left); break; case CORBA::tk_any: - result = this->any_does_contain (component, + result = this->any_does_contain (&component.in (), left); break; default: |