diff options
| author | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-04-23 04:43:59 +0000 |
|---|---|---|
| committer | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-04-23 04:43:59 +0000 |
| commit | a7c03cabf931b077d70c6f80ec02c7728a429f49 (patch) | |
| tree | 61d38d262d43ac77fc2ad94c9e7e850cd5607622 /netsvcs | |
| parent | 2aa7b10780ad7c670f588dce4ec341351a0646aa (diff) | |
| download | ATCD-a7c03cabf931b077d70c6f80ec02c7728a429f49.tar.gz | |
ChangeLogTag:Sat Apr 22 20:53:11 2000 Darrell Brunsch <brunsch@uci.edu>
Diffstat (limited to 'netsvcs')
| -rw-r--r-- | netsvcs/clients/Logger/indirect_logging.cpp | 2 | ||||
| -rw-r--r-- | netsvcs/clients/Naming/Client/main.cpp | 6 | ||||
| -rw-r--r-- | netsvcs/lib/Logging_Strategy.cpp | 2 | ||||
| -rw-r--r-- | netsvcs/lib/TS_Clerk_Handler.cpp | 4 | ||||
| -rw-r--r-- | netsvcs/lib/TS_Clerk_Handler.h | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/netsvcs/clients/Logger/indirect_logging.cpp b/netsvcs/clients/Logger/indirect_logging.cpp index aa5461e3b10..d13febea1d1 100644 --- a/netsvcs/clients/Logger/indirect_logging.cpp +++ b/netsvcs/clients/Logger/indirect_logging.cpp @@ -19,7 +19,7 @@ main (int argc, char *argv[]) ACE_OS::srand ((u_int) ACE_OS::time (0)); ACE_LOG_MSG->open (prog_name, ACE_Log_Msg::LOGGER, - ACE_WIDE_STRING (logger_key)); + ACE_TEXT_CHAR_TO_TCHAR (logger_key)); ACE_DEBUG ((LM_STARTUP, "starting up the test\n")); diff --git a/netsvcs/clients/Naming/Client/main.cpp b/netsvcs/clients/Naming/Client/main.cpp index 001218fa05d..8930bb61a6d 100644 --- a/netsvcs/clients/Naming/Client/main.cpp +++ b/netsvcs/clients/Naming/Client/main.cpp @@ -23,13 +23,13 @@ main (int, char *argv[]) new_args.add ("-d"); ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("argc = %d\n"), - ASYS_TEXT (new_args.argc ()))); + ACE_TEXT ("argc = %d\n"), + ACE_TEXT (new_args.argc ()))); // Print the contents of the combined <ACE_ARGV>. for (size_t i = 0; i < new_args.argc (); i++) ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%d) %s\n"), + ACE_TEXT ("(%d) %s\n"), i, new_args.argv ()[i])); diff --git a/netsvcs/lib/Logging_Strategy.cpp b/netsvcs/lib/Logging_Strategy.cpp index d1cb7442f9f..d2533a5ae0a 100644 --- a/netsvcs/lib/Logging_Strategy.cpp +++ b/netsvcs/lib/Logging_Strategy.cpp @@ -142,7 +142,7 @@ ACE_Logging_Strategy::init (int argc, char *argv[]) return ACE_LOG_MSG->open ("Logging_Strategy", ACE_LOG_MSG->flags (), - ACE_WIDE_STRING (ACE_DEFAULT_LOGGER_KEY)); + ACE_TEXT_CHAR_TO_TCHAR (ACE_DEFAULT_LOGGER_KEY)); } // The following is a "Factory" used by the ACE_Service_Config and diff --git a/netsvcs/lib/TS_Clerk_Handler.cpp b/netsvcs/lib/TS_Clerk_Handler.cpp index 724f31f6782..95565887a83 100644 --- a/netsvcs/lib/TS_Clerk_Handler.cpp +++ b/netsvcs/lib/TS_Clerk_Handler.cpp @@ -577,8 +577,8 @@ ACE_TS_Clerk_Processor::parse_args (int argc, char *argv[]) case 'p': // Get the poolname ACE_OS::strncpy (this->poolname_, - ACE_WIDE_STRING (get_opt.optarg), - sizeof this->poolname_ / sizeof (TCHAR)); + ACE_TEXT_CHAR_TO_TCHAR (get_opt.optarg), + sizeof this->poolname_ / sizeof (ACE_TCHAR)); break; case 'b': // Blocking semantics diff --git a/netsvcs/lib/TS_Clerk_Handler.h b/netsvcs/lib/TS_Clerk_Handler.h index 0a39709d7c9..4d2ba888736 100644 --- a/netsvcs/lib/TS_Clerk_Handler.h +++ b/netsvcs/lib/TS_Clerk_Handler.h @@ -231,7 +231,7 @@ private: int timeout_; // Time period for updating system time - TCHAR poolname_[MAXNAMLEN + 1]; + ACE_TCHAR poolname_[MAXNAMLEN + 1]; // Pool name for backing store int blocking_semantics_; |