diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2006-04-26 13:04:20 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2006-04-26 13:04:20 +0000 |
| commit | bf8dcbf38c776619986c9e7de613108f57e22a16 (patch) | |
| tree | 348c3a1ced422f5bc66b554a3fc7fa63aa06e4cd | |
| parent | 0fafefcb97ef0e0ae0e86e2c61670a5474bc2cb1 (diff) | |
| download | ATCD-bf8dcbf38c776619986c9e7de613108f57e22a16.tar.gz | |
ChangeLog tag: Wed Apr 26 13:01:48 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/tao/Valuetype/AbstractBase.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/Valuetype/AbstractBase.h | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 526ad5c8176..8906295d558 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Wed Apr 26 13:01:48 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> + + * tao/Valuetype/AbstractBase.cpp: + * tao/Valuetype/AbstractBase.h: + The _tao_marshal_v method is supposed to be const. + Wed Apr 26 13:01:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * tests/POA/Bug_2511_Regression/*: diff --git a/TAO/tao/Valuetype/AbstractBase.cpp b/TAO/tao/Valuetype/AbstractBase.cpp index af6ddd8d042..8fdaae3432a 100644 --- a/TAO/tao/Valuetype/AbstractBase.cpp +++ b/TAO/tao/Valuetype/AbstractBase.cpp @@ -389,7 +389,7 @@ operator>> (TAO_InputCDR &strm, CORBA::AbstractBase_ptr &abs) } CORBA::Boolean -CORBA::AbstractBase::_tao_marshal_v (TAO_OutputCDR &) +CORBA::AbstractBase::_tao_marshal_v (TAO_OutputCDR &) const { return false; } diff --git a/TAO/tao/Valuetype/AbstractBase.h b/TAO/tao/Valuetype/AbstractBase.h index 742716b2a2f..339d2918d8f 100644 --- a/TAO/tao/Valuetype/AbstractBase.h +++ b/TAO/tao/Valuetype/AbstractBase.h @@ -89,7 +89,7 @@ namespace CORBA /// TAO specific operation virtual const char* _tao_obv_repository_id (void) const; - virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &strm); + virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &strm) const; virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &strm); virtual CORBA::Boolean _tao_match_formal_type (ptrdiff_t ) const; |