summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgiovannd <giovannd@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-12-13 23:01:41 +0000
committergiovannd <giovannd@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-12-13 23:01:41 +0000
commit012532047ec879f7f62121d1c9e049ff91e34455 (patch)
tree548c744ad67d4012f92725825c90c9bbdd05e115
parent21105e3d60d22e1d8ee9557f2bbd5240c4ee6395 (diff)
downloadATCD-012532047ec879f7f62121d1c9e049ff91e34455.tar.gz
*** empty log message ***
-rw-r--r--TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp2
-rw-r--r--TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp2
-rw-r--r--TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp2
-rw-r--r--TAO/examples/OBV/Typed_Events/client.cpp4
-rw-r--r--TAO/examples/OBV/Typed_Events/server.cpp4
5 files changed, 7 insertions, 7 deletions
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
index c5ae00a4544..313893dd39a 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
@@ -11,7 +11,7 @@ ACE_RCSID (AMI_Iterator, Content_Iterator_i, "$Id$")
Content_Iterator_i::Content_Iterator_i (const char *pathname,
CORBA::ULong file_size)
- : file_ (pathname),
+ : file_ (ACE_TEXT_TO_TCHAR_IN(pathname)),
file_io_ (),
file_size_ (file_size),
chunk_index_ (1)
diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp
index d26e6b5569c..1ff4769adec 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp
@@ -11,7 +11,7 @@ ACE_RCSID (AMI_Observer, Callback_Handler, "$Id$")
Callback_Handler::Callback_Handler (const char *pathname,
Web_Server::Callback_ptr client_callback)
- : file_ (pathname),
+ : file_ (ACE_TEXT_TO_TCHAR_IN(pathname)),
file_io_ (),
callback_ (Web_Server::Callback::_duplicate (client_callback)),
ami_handler_ (),
diff --git a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
index 669ead91a3b..a31b5962d28 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
+++ b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
@@ -12,7 +12,7 @@ ACE_RCSID(SMI_Iterator, Content_Iterator_i, "$Id$")
Content_Iterator_i::Content_Iterator_i (const char *pathname,
CORBA::ULong file_size)
- : file_ (pathname),
+ : file_ (ACE_TEXT_TO_TCHAR_IN(pathname)),
file_io_ (),
file_size_ (file_size),
chunk_index_ (1)
diff --git a/TAO/examples/OBV/Typed_Events/client.cpp b/TAO/examples/OBV/Typed_Events/client.cpp
index 4d4793e51d8..5e18b4bbaf2 100644
--- a/TAO/examples/OBV/Typed_Events/client.cpp
+++ b/TAO/examples/OBV/Typed_Events/client.cpp
@@ -16,8 +16,8 @@ ACE_TMAIN (int argc, ACE_TCHAR **argv)
"\nEvent_Types client\n\n"));
if (client.run ("Event_Types_Checkpoint",
- argc,
- argv) == -1)
+ convert.get_argc(),
+ convert.get_ASCII_argv()) == -1)
return -1;
else
return 0;
diff --git a/TAO/examples/OBV/Typed_Events/server.cpp b/TAO/examples/OBV/Typed_Events/server.cpp
index 4f8d6627cdf..00c2f07f345 100644
--- a/TAO/examples/OBV/Typed_Events/server.cpp
+++ b/TAO/examples/OBV/Typed_Events/server.cpp
@@ -19,8 +19,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
ACE_TRY
{
if (server.init ("Event_Types_Checkpoint",
- argc,
- argv
+ convert.get_argc(),
+ convert.get_ASCII_argv()
ACE_ENV_ARG_PARAMETER) == -1)
return 1;
else