diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-02-21 14:56:49 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-02-21 14:56:49 +0000 |
| commit | ebbb34fdbef55a9a5628b5114c671da12600529b (patch) | |
| tree | df19070284411bcaf29e072259e3a180a094fe56 | |
| parent | 37ee56c46e559ecefbdafbc76fefca1a96cf1b75 (diff) | |
| download | ATCD-ebbb34fdbef55a9a5628b5114c671da12600529b.tar.gz | |
ChangeLogTag:Fri Feb 21 06:54:45 2003 Ossama Othman <ossama@uci.edu>
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_operation/operation.cpp | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 1dcf7845fdf..0e6bddacefa 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Fri Feb 21 06:54:45 2003 Ossama Othman <ossama@uci.edu> + + * TAO_IDL/be/be_visitor_operation/operation.cpp + (gen_marshal_and_invoke): + + Moved an ending "if" brace to within a TAO_HAS_INTERCEPTORS + block. Fixes builds with interceptors disabled. + Fri Feb 21 06:22:36 2003 Ossama Othman <ossama@uci.edu> * tao/ORBInitializer_Registry.cpp: diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp index 8d83a268db7..5767d648d01 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp @@ -1146,8 +1146,7 @@ be_visitor_operation::gen_marshal_and_invoke ( *os << "\n#endif /* TAO_HAS_INTERCEPTORS */" << be_nl; - *os << "}" << be_uidt << be_uidt_nl // End inner "else" block. - << "}" << be_uidt << be_uidt_nl; // End outer "else" block. + *os << "}" << be_uidt << be_uidt_nl; // End inner "else" block. // Note that we do NOT catch the PortableInterceptor::ForwardRequest // exception here. It is caught in the @@ -1156,6 +1155,7 @@ be_visitor_operation::gen_marshal_and_invoke ( // effort to get an easy (but illegal) way to forward a request. *os << "\n#if TAO_HAS_INTERCEPTORS == 1" << be_nl + << "}" << be_uidt << be_uidt_nl // End outer "else" block. << "}" << be_uidt_nl << "ACE_CATCHANY" << be_idt_nl << "{" << be_idt_nl; @@ -1278,7 +1278,7 @@ be_visitor_operation::gen_marshal_and_invoke ( *os << be_nl << "if (_invoke_status != TAO_INVOKE_RESTART)" << be_idt_nl - << "break;" << be_uidt << be_uidt_nl + << "break;" << be_uidt << be_uidt << be_uidt_nl << "}" << be_uidt << be_uidt; return 0; |