diff options
Diffstat (limited to 'TAO/tao/Environment.cpp')
-rw-r--r-- | TAO/tao/Environment.cpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/TAO/tao/Environment.cpp b/TAO/tao/Environment.cpp index 62b2ef0b142..6938ac7259e 100644 --- a/TAO/tao/Environment.cpp +++ b/TAO/tao/Environment.cpp @@ -1,7 +1,7 @@ -#include "tao/Environment.h" -#include "tao/ORB_Core.h" -#include "tao/SystemException.h" -#include "tao/default_environment.h" +#include "Environment.h" +#include "ORB_Core.h" +#include "SystemException.h" +#include "default_environment.h" #include "ace/OS_NS_string.h" @@ -15,8 +15,6 @@ ACE_RCSID (tao, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - CORBA::Environment::Environment (void) : exception_ (0) , previous_ (0) @@ -189,7 +187,7 @@ CORBA::Environment::print_exception (const char *info, ACE_DEBUG ((LM_ERROR, ACE_TEXT ("TAO: (%P|%t) EXCEPTION, %s\n"), - ACE_TEXT_CHAR_TO_TCHAR (info))); + ACE_TEXT_TO_TCHAR_IN (info))); CORBA::SystemException *x2 = CORBA::SystemException::_downcast (this->exception_); @@ -202,11 +200,10 @@ CORBA::Environment::print_exception (const char *info, ACE_DEBUG ((LM_ERROR, ACE_TEXT ("TAO: (%P|%t) user exception, ID '%s'\n"), - ACE_TEXT_CHAR_TO_TCHAR (id))); + ACE_TEXT_TO_TCHAR_IN (id))); } else ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("TAO: (%P|%t) no exception, %s\n"), ACE_TEXT_CHAR_TO_TCHAR (info))); + ACE_TEXT ("TAO: (%P|%t) no exception, %s\n"), ACE_TEXT_TO_TCHAR_IN (info))); } -TAO_END_VERSIONED_NAMESPACE_DECL |