summaryrefslogtreecommitdiff
path: root/TAO/tao/Exception.cpp
diff options
context:
space:
mode:
authorjohn_c <john_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-05-08 23:00:05 +0000
committerjohn_c <john_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-05-08 23:00:05 +0000
commitd1160e68b1301a8b0e120ba8da56bb2e7d4fb49e (patch)
treecf04398acb7ad9fb45311eb105d60975028bbc03 /TAO/tao/Exception.cpp
parent1c3dd540264435be21072a3a69a8a8e969bd2b1a (diff)
downloadATCD-oci_wchar_refactor_post_1_5_1_branch.tar.gz
Fri May 5 14:33:29 UTC 2006 Ciju John <john_c@ociweb.com>oci_wchar_refactor_post_1_5_1_branch
Diffstat (limited to 'TAO/tao/Exception.cpp')
-rw-r--r--TAO/tao/Exception.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp
index 16f65716ead..e3e1deb2d4e 100644
--- a/TAO/tao/Exception.cpp
+++ b/TAO/tao/Exception.cpp
@@ -94,21 +94,19 @@ CORBA::Exception::_tao_print_exception (const char *user_provided_info,
ACE_DEBUG ((LM_ERROR,
ACE_TEXT ("(%P|%t) EXCEPTION, %s\n")
ACE_TEXT ("%s\n"),
- ACE_TEXT_CHAR_TO_TCHAR (user_provided_info),
- ACE_TEXT_CHAR_TO_TCHAR (this->_info ().c_str ())));
+ ACE_TEXT_TO_TCHAR_IN (user_provided_info),
+ ACE_TEXT_TO_TCHAR_IN (this->_info ().c_str ())));
}
-#if defined (ACE_USES_WCHAR)
void
-CORBA::Exception::_tao_print_exception (const ACE_WCHAR_T *info,
+CORBA::Exception::_tao_print_exception (const wchar_t *info,
FILE *f) const
{
// Even though this call causes additional type conversions, this is
// better for the maintenance. Plus, this will occur only on
// exception anyway.
- this->_tao_print_exception (ACE_TEXT_ALWAYS_CHAR (info), f);
+ this->_tao_print_exception (ACE_TEXT_TO_CHAR_IN (info), f);
}
-#endif // ACE_USES_WCHAR
void
CORBA::Exception::_tao_any_destructor (void *x)