diff options
author | john_c <john_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-04-28 03:50:28 +0000 |
---|---|---|
committer | john_c <john_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-04-28 03:50:28 +0000 |
commit | 88556d568eb0a06bf8af2ddefacbc1ad5f00401e (patch) | |
tree | 72f4a0e33b9dd26d1783ff005d67494bfb79a9de /TAO/tao/Object.cpp | |
parent | 317d8c1ce78436f0107f056418c0c5f5b4231069 (diff) | |
download | ATCD-88556d568eb0a06bf8af2ddefacbc1ad5f00401e.tar.gz |
4_27_06 branch merge in and compile error fixedoci_dave_wchar_refactor_branch
Diffstat (limited to 'TAO/tao/Object.cpp')
-rw-r--r-- | TAO/tao/Object.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index 0df3b311b58..e39e2e473a3 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -158,7 +158,7 @@ CORBA::Object::marshal (TAO_OutputCDR &cdr) } /*static*/ CORBA::Boolean -CORBA::Object::marshal (CORBA::Object_ptr x, +CORBA::Object::marshal (const CORBA::Object_ptr x, TAO_OutputCDR &cdr) { if (x == 0) |