diff options
| author | john_c <john_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-11-08 16:28:10 +0000 |
|---|---|---|
| committer | john_c <john_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-11-08 16:28:10 +0000 |
| commit | 4c1cdd6f6541287cd8bc7aaf09bcbc2677a01374 (patch) | |
| tree | e4e758f1d772667eb050cc264d1bcb0d9f717165 | |
| parent | 103d4362e4fe462222015dd9c449996ef1015272 (diff) | |
| download | ATCD-4c1cdd6f6541287cd8bc7aaf09bcbc2677a01374.tar.gz | |
More of Daves ACE_USES_WCHAR fixes
6 files changed, 6 insertions, 6 deletions
diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp index 0ba6b81e0d5..e6021aa0f2b 100644 --- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp +++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp @@ -126,7 +126,7 @@ Concurrency_Service::init (int argc, { ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", - ior_file_name_), + ior_file_name_.c_str()), -1); } diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp index 6223d92e53d..3445e36c823 100644 --- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp +++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp @@ -147,7 +147,7 @@ Basic_Logging_Service::init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL) if (iorf == 0) { ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", - ior_file_name_), + ior_file_name_.c_str()), -1); } diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp index 106af467243..649fc2e7085 100644 --- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp +++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp @@ -152,7 +152,7 @@ Event_Logging_Service::init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL) if (iorf == 0) { ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", - ior_file_name_), + ior_file_name_.c_str()), -1); } diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp index 6a8086e2dac..287201307d5 100644 --- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp +++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp @@ -175,7 +175,7 @@ Notify_Logging_Service::init (int argc, ACE_TCHAR *argv[] { ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", - ior_file_name_), + ior_file_name_.c_str()), -1); } diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp index b0999647281..3eac4191082 100644 --- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp +++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp @@ -226,7 +226,7 @@ RTEvent_Logging_Service::run (int argc, ACE_TCHAR* argv[]) if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", - this->ior_file_name_), + this->ior_file_name_.c_str()), 1); ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); diff --git a/ace/OS_NS_stdlib_base.inl b/ace/OS_NS_stdlib_base.inl index 8a8b025f7cc..5ee64c03421 100644 --- a/ace/OS_NS_stdlib_base.inl +++ b/ace/OS_NS_stdlib_base.inl @@ -15,7 +15,7 @@ template <typename DCHAR, typename SCHAR> inline size_t string_copy (DCHAR* dest, const SCHAR* src, size_t len) { // We must have a source and a valid length with a dest - if ( src == 0 || ( dest != 0 && len < 0 ) ) + if ( src == 0 || ( dest != 0 && static_cast<signed int>(len) < 0 ) ) { return -1; } |