diff options
| author | mcorino <mcorino@users.noreply.github.com> | 2008-01-07 15:44:01 +0000 |
|---|---|---|
| committer | mcorino <mcorino@users.noreply.github.com> | 2008-01-07 15:44:01 +0000 |
| commit | c2b9129a53366440111af2ae7e0b592b828523fc (patch) | |
| tree | 40c155c7539bd5a63c8411da78520e7c3ac1c45c | |
| parent | 33cd22d52148ed0158a65f69e13b6c3c34aa77e0 (diff) | |
| download | ATCD-c2b9129a53366440111af2ae7e0b592b828523fc.tar.gz | |
ChangeLogTag: Mon Jan 7 15:43:12 UTC 2008 Martin Corino <mcorino@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/DynamicInterface/Unknown_User_Exception.cpp | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index c72a80bf7dc..43b1aeb81eb 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Mon Jan 7 15:43:12 UTC 2008 Martin Corino <mcorino@remedy.nl> + + * tao/DynamicInterface/DII_Invocation_Adapter.cpp: + Added space to fix compile warning with VC71. + + * tao/DynamicInterface/Unknown_User_Exception.cpp: + Added missing 'return'; + Mon Jan 7 12:56:12 UTC 2008 Martin Corino <mcorino@remedy.nl> * tao/PortableServer/Collocated_Arguments_Converter.h: diff --git a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp index 31ee9172549..7b2bdb7c259 100644 --- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp +++ b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp @@ -56,7 +56,7 @@ namespace TAO } void - DII_Invocation_Adapter::invoke (TAO::Exception_Data */*ex_data*/, + DII_Invocation_Adapter::invoke (TAO::Exception_Data * /*ex_data*/, unsigned long ex_count) { // Convert DII exception list to a form the invocation can use diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp index b1187578db5..1208f1d64de 100644 --- a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp +++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp @@ -99,7 +99,7 @@ CORBA::UnknownUserException::_tao_decode (TAO_InputCDR &) const char * CORBA::UnknownUserException::_rep_id (void) const { - this->exception_->_tao_get_typecode ()->id (); + return this->exception_->_tao_get_typecode ()->id (); } CORBA::TypeCode_ptr |