From 557d90321ac009c4e9e56e729b2a6574dd6841e2 Mon Sep 17 00:00:00 2001 From: schmidt Date: Mon, 7 Jun 1999 15:50:07 +0000 Subject: . --- ChangeLog-99b | 7 +++++ TAO/ChangeLog-99c | 4 +++ TAO/examples/POA/DSI/client.cpp | 49 +++++++++++++++++++---------- examples/IPC_SAP/DEV_SAP/writer/writer.cpp | 2 +- examples/Service_Configurator/Misc/main.cpp | 5 +-- 5 files changed, 47 insertions(+), 20 deletions(-) diff --git a/ChangeLog-99b b/ChangeLog-99b index 330b191c59c..68c835ce9ce 100644 --- a/ChangeLog-99b +++ b/ChangeLog-99b @@ -1,5 +1,12 @@ Mon Jun 7 00:11:00 1999 Douglas C. Schmidt + * examples/Service_Configurator/Misc/main.cpp (main): Cast to + (ASYS_TCHAR **) rather than (ASYS_THCAR *[]). Thanks to David + for reporting this. + + * examples/IPC_SAP/DEV_SAP/writer/writer.cpp (main): Fixed a stray + comma. Thanks to David for reporting this. + * tests/Hash_Map_Manager_Test.cpp: Changed the use of ASYS_TCHAR * to LPCTSTR to ensure const-correctness. diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index b9f9d11a24f..484171ad40c 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,5 +1,9 @@ Mon Jun 7 01:11:06 1999 Douglas C. Schmidt + * examples/POA/DSI/client.cpp (main): Corrected an overly + aggresive removal of "const char *". Thanks to David for + reporting this. + * orbsvcs/orbsvcs/Naming/Naming_Context.h: Added default CORBA::Environment & = TAO_default_environment() calls. Thanks to Frank Buschmann for reporting this. diff --git a/TAO/examples/POA/DSI/client.cpp b/TAO/examples/POA/DSI/client.cpp index f8f581698c9..589559e0705 100644 --- a/TAO/examples/POA/DSI/client.cpp +++ b/TAO/examples/POA/DSI/client.cpp @@ -21,7 +21,7 @@ ACE_RCSID(DSI, client, "$Id$") -static const char *IOR = 0; +static char *IOR = 0; static const char *IOR_file = 0; static int shutdown_server = 0; @@ -71,7 +71,8 @@ int read_IOR_from_file (void) { // Open the file for reading. - ACE_HANDLE f_handle = ACE_OS::open (IOR_file, 0); + ACE_HANDLE f_handle = + ACE_OS::open (IOR_file, 0); if (f_handle == ACE_INVALID_HANDLE) ACE_ERROR_RETURN ((LM_ERROR, @@ -106,10 +107,14 @@ main (int argc, char **argv) { ACE_OS::strcpy (str, "CORBA::ORB_init"); - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV); + CORBA::ORB_var orb = CORBA::ORB_init (argc, + argv, + + 0, ACE_TRY_ENV); ACE_TRY_CHECK; - // Parse the command-line arguments to get the location of the IOR + // Parse the command-line arguments to get the location of the + // IOR if (parse_args (argc, argv) == -1) return -1; @@ -117,28 +122,36 @@ main (int argc, char **argv) { int result = read_IOR_from_file (); if (result != 0) - ACE_ERROR_RETURN ((LM_ERROR, "Cannot read IOR from %s\n", IOR_file), -1); + ACE_ERROR_RETURN ((LM_ERROR, + "Cannot read IOR from %s\n", + IOR_file), + -1); } - ACE_OS::strcpy (str, "CORBA::ORB::string_to_object"); + ACE_OS::strcpy (str, + "CORBA::ORB::string_to_object"); // Get the object reference with the IOR CORBA::Object_var object = orb->string_to_object (IOR, ACE_TRY_ENV); ACE_TRY_CHECK; - ACE_OS::strcpy (str,"Database::Agent::_narrow"); + ACE_OS::strcpy (str, + "Database::Agent::_narrow"); // Narrow the object reference to a Database::Agent - Database::Agent_var database_agent = Database::Agent::_narrow (object.in (), - ACE_TRY_ENV); + Database::Agent_var database_agent = + Database::Agent::_narrow (object.in (), + ACE_TRY_ENV); ACE_TRY_CHECK; Database::NVPairSequence employee_attributes (2); employee_attributes.length (2); - Database::NamedValue &first = employee_attributes[0]; - Database::NamedValue &second = employee_attributes[1]; + Database::NamedValue &first = + employee_attributes[0]; + Database::NamedValue &second = + employee_attributes[1]; char *name = "irfan"; CORBA::Long id = 555; @@ -151,16 +164,18 @@ main (int argc, char **argv) ACE_OS::strcpy (str,"Database::Agent::create_entry"); // Create an employee - Database::Entry_var entry = database_agent->create_entry ("irfan", - "Employee", - employee_attributes, - ACE_TRY_ENV); + Database::Entry_var entry = + database_agent->create_entry ("irfan", + "Employee", + employee_attributes, + ACE_TRY_ENV); ACE_TRY_CHECK; ACE_OS::strcpy (str, "Database::Employee::_narrow"); - Database::Employee_var employee = Database::Employee::_narrow (entry.in (), - ACE_TRY_ENV); + Database::Employee_var employee = + Database::Employee::_narrow (entry.in (), + ACE_TRY_ENV); ACE_TRY_CHECK; /* diff --git a/examples/IPC_SAP/DEV_SAP/writer/writer.cpp b/examples/IPC_SAP/DEV_SAP/writer/writer.cpp index a1629d58bb8..68a4e8bd6ec 100644 --- a/examples/IPC_SAP/DEV_SAP/writer/writer.cpp +++ b/examples/IPC_SAP/DEV_SAP/writer/writer.cpp @@ -21,7 +21,7 @@ main (int argc, char *argv[]) ACE_DEV_Addr (argv[1])) == -1) ACE_ERROR_RETURN ((LM_ERROR, -, "%p\n", + "%p\n", argv[1]), 1); diff --git a/examples/Service_Configurator/Misc/main.cpp b/examples/Service_Configurator/Misc/main.cpp index 2b54045056b..b74864410cf 100644 --- a/examples/Service_Configurator/Misc/main.cpp +++ b/examples/Service_Configurator/Misc/main.cpp @@ -48,8 +48,9 @@ main (int, ASYS_TCHAR *argv[]) l_argv[8] = 0; if (ACE_Service_Config::open (8, - (ASYS_TCHAR *[]) l_argv, - ACE_DEFAULT_LOGGER_KEY, 0) == -1 && errno != ENOENT) + (ASYS_TCHAR **) l_argv, + ACE_DEFAULT_LOGGER_KEY, 0) == -1 + && errno != ENOENT) ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("open")), -- cgit v1.2.1