diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-03-29 14:47:04 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-03-29 14:47:04 +0000 |
| commit | f714818ab05257372cac20a6f2024423ae8416c2 (patch) | |
| tree | 73d0031afe7fd41d80de0a9fc5decafa802063c7 | |
| parent | 89907aea72098c9e3212612bd34cda23dbb0801e (diff) | |
| download | ATCD-f714818ab05257372cac20a6f2024423ae8416c2.tar.gz | |
ChangeLogTag: Tue Mar 29 15:46:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/tao/Exception.cpp | 8 | ||||
| -rw-r--r-- | TAO/tao/Exception.h | 8 |
3 files changed, 14 insertions, 9 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 3298d515d91..37db2b3d5e3 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,4 +1,9 @@ -Mon Mar 28 12:48:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> +Tue Mar 29 15:46:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/Exception.{h,cpp}: + Replaced ostream with ACE_OSTREAM_TYPE + +Tue Mar 29 12:48:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * tao/Union_TypeCode.{h,cpp}: Fixed compile errors with Borland diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp index 92e4d7df62e..f20b8630606 100644 --- a/TAO/tao/Exception.cpp +++ b/TAO/tao/Exception.cpp @@ -139,16 +139,16 @@ CORBA::Exception::_tao_any_destructor (void *x) namespace CORBA { - ostream& operator<< (ostream &os, - const CORBA::Exception &e) + ACE_OSTREAM_TYPE& operator<< (ACE_OSTREAM_TYPE &os, + const CORBA::Exception &e) { os << e._name () << " (" << e._rep_id () << ')'; return os; } - ostream& operator<< (ostream &os, - const CORBA::Exception *e) + ACE_OSTREAM_TYPE& operator<< (ACE_OSTREAM_TYPE &os, + const CORBA::Exception *e) { os << e->_name () << " (" << e->_rep_id () << ')'; diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h index ad2a1164296..0fa08e935b8 100644 --- a/TAO/tao/Exception.h +++ b/TAO/tao/Exception.h @@ -203,11 +203,11 @@ namespace CORBA #if !defined (ACE_LACKS_IOSTREAM_TOTALLY) // Required by C++ mapping. - TAO_Export ostream& operator<< (ostream &os, - const CORBA::Exception &e); + TAO_Export ACE_OSTREAM_TYPE& operator<< (ACE_OSTREAM_TYPE &os, + const CORBA::Exception &e); - TAO_Export ostream& operator<< (ostream &os, - const CORBA::Exception *e); + TAO_Export ACE_OSTREAM_TYPE& operator<< (ACE_OSTREAM_TYPE &os, + const CORBA::Exception *e); #endif /* (ACE_LACKS_IOSTREAM_TOTALLY) */ } // End CORBA namespace |