diff options
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLog | 11 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp | 6 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp | 8 | ||||
| -rw-r--r-- | TAO/tao/AnyTypeCode/ExceptionA.cpp | 16 |
4 files changed, 24 insertions, 17 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 7b3196f7bd2..a2b9269f803 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,8 +1,17 @@ +Mon Jun 28 09:17:34 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> + + * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp: + * TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp: + Generate the needed vendor value + + * tao/AnyTypeCode/ExceptionA.cpp: + Layout changes + Fri Jun 25 19:05:03 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/fe/lex.yy.cpp: * TAO_IDL/fe/idl.ll: - + With the 'ciao ami4ccm idl "xxx"' pragma, changed the logic to add the "xxx" filename to the list, not in the main IDL file as before, but in every other IDL file instead. This diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp index 164841fb863..33f25aec814 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp @@ -86,13 +86,15 @@ be_visitor_connector_dds_exh::visit_connector (be_connector *node) if (ut->size_type () == AST_Type::FIXED) { - os_ << "true> "; + os_ << "true, "; } else { - os_ << "false> "; + os_ << "false, "; } + os_ << be_nl << "DDS4CCM_NDDS" << ">"; + os_ << be_uidt << be_uidt << be_uidt_nl << "{" << be_nl << "public:" << be_idt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp index c22fed0435b..0b244cfb1d8 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp @@ -70,13 +70,15 @@ be_visitor_connector_dds_exs::visit_connector (be_connector *node) if (ut->size_type () == AST_Type::FIXED) { - os_ << "true> "; + os_ << "true, "; } else { - os_ << "false> "; + os_ << "false, "; } - + + os_ << "DDS4CCM_NDDS" << ">"; + os_ << "()" << be_uidt << be_uidt << be_uidt_nl << "{" << be_nl diff --git a/TAO/tao/AnyTypeCode/ExceptionA.cpp b/TAO/tao/AnyTypeCode/ExceptionA.cpp index c2401c10a9b..55f7ff6ef58 100644 --- a/TAO/tao/AnyTypeCode/ExceptionA.cpp +++ b/TAO/tao/AnyTypeCode/ExceptionA.cpp @@ -26,9 +26,7 @@ namespace TAO { template<> void - Any_Dual_Impl_T<CORBA::Exception>::value ( - const CORBA::Exception & val - ) + Any_Dual_Impl_T<CORBA::Exception>::value (const CORBA::Exception & val) { this->value_ = val._tao_duplicate (); } @@ -56,8 +54,7 @@ namespace TAO { try { - this->value_->_tao_decode (cdr - ); + this->value_->_tao_decode (cdr); return true; } @@ -78,8 +75,7 @@ namespace TAO const CORBA::Any &, _tao_destructor, CORBA::TypeCode_ptr, - const CORBA::Exception *& - ) + const CORBA::Exception *&) { return false; } @@ -96,8 +92,7 @@ operator<<= (CORBA::Any &any, const CORBA::Exception &exception) any, CORBA::Exception::_tao_any_destructor, exception._tao_type (), - exception - ); + exception); } // Insertion of CORBA::Exception - non-copying. @@ -108,8 +103,7 @@ operator<<= (CORBA::Any &any, CORBA::Exception *exception) any, CORBA::Exception::_tao_any_destructor, exception->_tao_type (), - exception - ); + exception); } |