diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-10-03 21:02:32 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-10-03 21:02:32 +0000 |
| commit | 4dcca24c609008f9fe8a4e01966702b8f4c08e61 (patch) | |
| tree | 6bf00b87749636ef3ea7ec22a9b13d4dd2597378 /tao/Object.cpp | |
| parent | 8c7cc4d18ddf28a18a01fef53aaea68422b2fff2 (diff) | |
| download | ATCD-alt_mapping_SAIC.tar.gz | |
Merged version 94552 from main trunk into this branchalt_mapping_SAIC
Diffstat (limited to 'tao/Object.cpp')
| -rw-r--r-- | tao/Object.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tao/Object.cpp b/tao/Object.cpp index 6acd25d3d5d..2c69cecc82f 100644 --- a/tao/Object.cpp +++ b/tao/Object.cpp @@ -128,8 +128,7 @@ CORBA::Object::marshal (TAO_OutputCDR &cdr) } /*static*/ CORBA::Boolean -CORBA::Object::marshal (const CORBA::Object_ptr x, - TAO_OutputCDR &cdr) +CORBA::Object::marshal (const CORBA::Object_ptr x, TAO_OutputCDR &cdr) { if (x == 0) { |