ChangeLogTag: Tue Jun 24 12:02:00 UTC 2008 Simon Massey <sma at prismtech dot com>

17 files changed, 30 insertions, 30 deletions

diff --git a/TAO/docs/tutorials/Quoter/AMI/client.cpp b/TAO/docs/tutorials/Quoter/AMI/client.cpp
index fcb8a8f26da..f2b4d931aa0 100644
--- a/TAO/docs/tutorials/Quoter/AMI/client.cpp
+++ b/TAO/docs/tutorials/Quoter/AMI/client.cpp
@@ -5,7 +5,7 @@
 #include "Handler_i.h"
 #include "ace/streams.h"
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   try {
     // First initialize the ORB, that will remove some arguments...
@@ -34,7 +34,7 @@ int main (int argc, char* argv[])
     // in real applications we use the naming service, but let's do
     // the easy part first!
     CORBA::Object_var factory_object =
-      orb->string_to_object (argv[1]);
+      orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (argv[1]));
 
     // Now downcast the object reference to the appropriate type
     Quoter::Stock_Factory_var factory =
@@ -52,7 +52,7 @@ int main (int argc, char* argv[])
       try {
         // Get the stock object
         Quoter::Stock_var tmp =
-          factory->get_stock (argv[i]);
+          factory->get_stock (ACE_TEXT_ALWAYS_CHAR (argv[i]));
         Quoter::Single_Query_Stock_var stock =
           Quoter::Single_Query_Stock::_narrow (tmp.in ());
         if (CORBA::is_nil (stock.in ())) {
diff --git a/TAO/docs/tutorials/Quoter/AMI/server.cpp b/TAO/docs/tutorials/Quoter/AMI/server.cpp
index 9d4c01d9a74..fa59ad6bccb 100644
--- a/TAO/docs/tutorials/Quoter/AMI/server.cpp
+++ b/TAO/docs/tutorials/Quoter/AMI/server.cpp
@@ -5,7 +5,7 @@
 #include "Stock_Factory_i.h"
 #include "ace/streams.h"
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   try {
     // First initialize the ORB, that will remove some arguments...
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/client.cpp b/TAO/docs/tutorials/Quoter/Event_Service/client.cpp
index 43abc2992c9..9a238223729 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/client.cpp
+++ b/TAO/docs/tutorials/Quoter/Event_Service/client.cpp
@@ -6,7 +6,7 @@
 #include <orbsvcs/CosNamingC.h>
 #include "ace/streams.h"
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   try {
     // First initialize the ORB, that will remove some arguments...
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/server.cpp b/TAO/docs/tutorials/Quoter/Event_Service/server.cpp
index 56b0532a42c..580dfcbaf55 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/server.cpp
+++ b/TAO/docs/tutorials/Quoter/Event_Service/server.cpp
@@ -7,7 +7,7 @@
 #include "ace/streams.h"
 #include "ace/OS_NS_unistd.h"
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   try {
     // First initialize the ORB, that will remove some arguments...
@@ -67,7 +67,7 @@ int main (int argc, char* argv[])
         try {
           // Get the stock object
           Quoter::Stock_var stock =
-            stock_factory->get_stock (argv[i]);
+            stock_factory->get_stock (ACE_TEXT_ALWAYS_CHAR (argv[i]));
 
           CORBA::String_var full_name = stock->full_name ();
 
diff --git a/TAO/docs/tutorials/Quoter/Naming_Service/client.cpp b/TAO/docs/tutorials/Quoter/Naming_Service/client.cpp
index c26cf41b26c..ebf143b7dc2 100644
--- a/TAO/docs/tutorials/Quoter/Naming_Service/client.cpp
+++ b/TAO/docs/tutorials/Quoter/Naming_Service/client.cpp
@@ -6,7 +6,7 @@
 #include <orbsvcs/CosNamingC.h>
 #include "ace/streams.h"
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   try {
     // First initialize the ORB, that will remove some arguments...
@@ -44,7 +44,7 @@ int main (int argc, char* argv[])
       try {
         // Get the stock object
         Quoter::Stock_var stock =
-          factory->get_stock (argv[i]);
+          factory->get_stock (ACE_TEXT_ALWAYS_CHAR (argv[i]));
 
         // Get its name, put it on a _var so it is automatically
         // released!
diff --git a/TAO/docs/tutorials/Quoter/Naming_Service/server.cpp b/TAO/docs/tutorials/Quoter/Naming_Service/server.cpp
index 86d293611bc..56f3f056f9c 100644
--- a/TAO/docs/tutorials/Quoter/Naming_Service/server.cpp
+++ b/TAO/docs/tutorials/Quoter/Naming_Service/server.cpp
@@ -6,7 +6,7 @@
 #include "orbsvcs/CosNamingC.h"
 #include "ace/streams.h"
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   try {
     // First initialize the ORB, that will remove some arguments...
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/client.cpp b/TAO/docs/tutorials/Quoter/On_Demand_Activation/client.cpp
index fcb8a8f26da..f2b4d931aa0 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/client.cpp
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/client.cpp
@@ -5,7 +5,7 @@
 #include "Handler_i.h"
 #include "ace/streams.h"
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   try {
     // First initialize the ORB, that will remove some arguments...
@@ -34,7 +34,7 @@ int main (int argc, char* argv[])
     // in real applications we use the naming service, but let's do
     // the easy part first!
     CORBA::Object_var factory_object =
-      orb->string_to_object (argv[1]);
+      orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (argv[1]));
 
     // Now downcast the object reference to the appropriate type
     Quoter::Stock_Factory_var factory =
@@ -52,7 +52,7 @@ int main (int argc, char* argv[])
       try {
         // Get the stock object
         Quoter::Stock_var tmp =
-          factory->get_stock (argv[i]);
+          factory->get_stock (ACE_TEXT_ALWAYS_CHAR (argv[i]));
         Quoter::Single_Query_Stock_var stock =
           Quoter::Single_Query_Stock::_narrow (tmp.in ());
         if (CORBA::is_nil (stock.in ())) {
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/server.cpp b/TAO/docs/tutorials/Quoter/On_Demand_Activation/server.cpp
index bf880a31793..dfdeca56f8a 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/server.cpp
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/server.cpp
@@ -5,7 +5,7 @@
 #include "Stock_Factory_Locator_i.h"
 #include "ace/streams.h"
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   try {
     // First initialize the ORB, that will remove some arguments...
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/client.cpp b/TAO/docs/tutorials/Quoter/RT_Event_Service/client.cpp
index 8bdaab076a8..47ed3316ba1 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/client.cpp
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/client.cpp
@@ -9,7 +9,7 @@
 #include "ace/OS_NS_string.h"
 #include "tao/Exception.h"
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   try {
     // First initialize the ORB, that will remove some arguments...
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/server.cpp b/TAO/docs/tutorials/Quoter/RT_Event_Service/server.cpp
index 3660fc9b82d..fbc244f101d 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/server.cpp
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/server.cpp
@@ -7,7 +7,7 @@
 #include "ace/streams.h"
 #include "ace/OS_NS_unistd.h"
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   try {
     // First initialize the ORB, that will remove some arguments...
@@ -67,7 +67,7 @@ int main (int argc, char* argv[])
         try {
           // Get the stock object
           Quoter::Stock_var stock =
-            stock_factory->get_stock (argv[i]);
+            stock_factory->get_stock (ACE_TEXT_ALWAYS_CHAR (argv[i]));
 
           CORBA::String_var full_name = stock->full_name ();
 
diff --git a/TAO/docs/tutorials/Quoter/Simple/Client/client.cpp b/TAO/docs/tutorials/Quoter/Simple/Client/client.cpp
index 0715a3539fe..2fbf830d0cf 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Client/client.cpp
+++ b/TAO/docs/tutorials/Quoter/Simple/Client/client.cpp
@@ -6,7 +6,7 @@
 #include "QuoterC.h"
 #include "ace/streams.h"
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   try {
     // First initialize the ORB, that will remove some arguments...
@@ -27,7 +27,7 @@ int main (int argc, char* argv[])
     // in real applications we use the naming service, but let's do
     // the easy part first!
     CORBA::Object_var factory_object =
-      orb->string_to_object (argv[1]);
+      orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (argv[1]));
 
     // Now downcast the object reference to the appropriate type
     Quoter::Stock_Factory_var factory =
@@ -38,7 +38,7 @@ int main (int argc, char* argv[])
       try {
         // Get the stock object
         Quoter::Stock_var stock =
-          factory->get_stock (argv[i]);
+          factory->get_stock (ACE_TEXT_ALWAYS_CHAR (argv[i]));
 
         // Get its name, put it on a _var so it is automatically
         // released!
diff --git a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/client.cpp b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/client.cpp
index 0715a3539fe..2fbf830d0cf 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/client.cpp
+++ b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/client.cpp
@@ -6,7 +6,7 @@
 #include "QuoterC.h"
 #include "ace/streams.h"
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   try {
     // First initialize the ORB, that will remove some arguments...
@@ -27,7 +27,7 @@ int main (int argc, char* argv[])
     // in real applications we use the naming service, but let's do
     // the easy part first!
     CORBA::Object_var factory_object =
-      orb->string_to_object (argv[1]);
+      orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (argv[1]));
 
     // Now downcast the object reference to the appropriate type
     Quoter::Stock_Factory_var factory =
@@ -38,7 +38,7 @@ int main (int argc, char* argv[])
       try {
         // Get the stock object
         Quoter::Stock_var stock =
-          factory->get_stock (argv[i]);
+          factory->get_stock (ACE_TEXT_ALWAYS_CHAR (argv[i]));
 
         // Get its name, put it on a _var so it is automatically
         // released!
diff --git a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/server.cpp b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/server.cpp
index d46b045541d..b5a7838526c 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/server.cpp
+++ b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/server.cpp
@@ -18,7 +18,7 @@
 #include "tao/IORTable/IORTable.h"
 #include "ace/streams.h"
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   try {
 
diff --git a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/server.cpp b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/server.cpp
index 06692da309e..5b2f841ce9d 100644
--- a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/server.cpp
+++ b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/server.cpp
@@ -6,7 +6,7 @@
 #include "Stock_i.h"
 #include "ace/streams.h"
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   try {
     // First initialize the ORB, that will remove some arguments...
diff --git a/TAO/docs/tutorials/Quoter/Simple/Persistent/client.cpp b/TAO/docs/tutorials/Quoter/Simple/Persistent/client.cpp
index 0715a3539fe..2fbf830d0cf 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Persistent/client.cpp
+++ b/TAO/docs/tutorials/Quoter/Simple/Persistent/client.cpp
@@ -6,7 +6,7 @@
 #include "QuoterC.h"
 #include "ace/streams.h"
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   try {
     // First initialize the ORB, that will remove some arguments...
@@ -27,7 +27,7 @@ int main (int argc, char* argv[])
     // in real applications we use the naming service, but let's do
     // the easy part first!
     CORBA::Object_var factory_object =
-      orb->string_to_object (argv[1]);
+      orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (argv[1]));
 
     // Now downcast the object reference to the appropriate type
     Quoter::Stock_Factory_var factory =
@@ -38,7 +38,7 @@ int main (int argc, char* argv[])
       try {
         // Get the stock object
         Quoter::Stock_var stock =
-          factory->get_stock (argv[i]);
+          factory->get_stock (ACE_TEXT_ALWAYS_CHAR (argv[i]));
 
         // Get its name, put it on a _var so it is automatically
         // released!
diff --git a/TAO/docs/tutorials/Quoter/Simple/Persistent/server.cpp b/TAO/docs/tutorials/Quoter/Simple/Persistent/server.cpp
index 06f5d6282cb..95cc2869e69 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Persistent/server.cpp
+++ b/TAO/docs/tutorials/Quoter/Simple/Persistent/server.cpp
@@ -18,7 +18,7 @@
 #include "Stock_Factory_i.h"
 #include "ace/streams.h"
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try {
 
diff --git a/TAO/docs/tutorials/Quoter/Simple/Server/server.cpp b/TAO/docs/tutorials/Quoter/Simple/Server/server.cpp
index 150b59789bc..1cbcf6cae70 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Server/server.cpp
+++ b/TAO/docs/tutorials/Quoter/Simple/Server/server.cpp
@@ -5,7 +5,7 @@
 #include "Stock_Factory_i.h"
 #include "ace/streams.h"
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   try {
     // First initialize the ORB, that will remove some arguments...