diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-02-09 21:13:00 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-02-09 21:13:00 +0000 |
| commit | 65def34240d44e87737687665493c2d493c4bc42 (patch) | |
| tree | 99edb2cf27685ffaf4b81bf02173db8ee04fbc91 /TAO | |
| parent | 4cb796be0a01c810760aa147be713e396502cddb (diff) | |
| download | ATCD-65def34240d44e87737687665493c2d493c4bc42.tar.gz | |
ChangeLogTag: Thu Feb 9 21:07:51 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu>
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLog | 16 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_helper.cpp | 2 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be_include/be_helper.h | 2 |
3 files changed, 17 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index abfe04e854e..5c8298e5f67 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,17 @@ +Thu Feb 9 21:07:51 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> + + * TAO_IDL/be/be_helper.cpp: + * TAO_IDL/be_include/be_helper.h: + + Changed the signature of the TAO_OutStream operator that + takes a TAO_ACE_CHECK struct to get a const reference of + the struct, instead of a non-const reference. In code + generation, this struct is passed to the operator as a + temporary, and gcc is evidently catching that a temporary + shouldn't be passed as a non-const reference (Visual Studio + did not catch it), but reporting the error as a failure to + resolve the operator overload. + Thu Feb 9 20:17:37 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> * orbsvcs/orbsvcs/Makefile.am: @@ -14,7 +28,7 @@ Thu Feb 9 20:06:18 UTC 2006 Wallace Zhang <zhangw@ociweb.com> * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp: Changed the return value of function is_profile_equivalent when - comparing an IOR and an IOGR. Basically, when you compare an + comparing an IOR and an IOGR. Basically, when you compare an IOR and an IOGR, we need to return "DONT_KNOW",not "NOT_EQUIVALENT". diff --git a/TAO/TAO_IDL/be/be_helper.cpp b/TAO/TAO_IDL/be/be_helper.cpp index 9f5b4683ab0..c8ba868ba4b 100644 --- a/TAO/TAO_IDL/be/be_helper.cpp +++ b/TAO/TAO_IDL/be/be_helper.cpp @@ -516,7 +516,7 @@ TAO_OutStream::operator<< (const TAO_ENV_ARG& i) } TAO_OutStream & -TAO_OutStream::operator<< (TAO_ACE_CHECK& i) +TAO_OutStream::operator<< (const TAO_ACE_CHECK& i) { if (!be_global->use_raw_throw ()) { diff --git a/TAO/TAO_IDL/be_include/be_helper.h b/TAO/TAO_IDL/be_include/be_helper.h index 95cc6bf2b72..450d1c1a970 100644 --- a/TAO/TAO_IDL/be_include/be_helper.h +++ b/TAO/TAO_IDL/be_include/be_helper.h @@ -239,7 +239,7 @@ public: TAO_OutStream &operator<< (const TAO_ENV_ARG& i); // Conditional and generic output for all forms of "ACE_ENV_*". - TAO_OutStream &operator<< (TAO_ACE_CHECK& i); + TAO_OutStream &operator<< (const TAO_ACE_CHECK& i); // Conditional and generic output for all forms of "ACE_CHECK". TAO_OutStream &operator<< (const TAO_ACE_TRY_CHECK& i); |