diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-06-14 09:28:39 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-06-14 09:28:39 +0000 |
commit | 7cd9ac3770820ee9cef70cfbeace6d7eec8ae396 (patch) | |
tree | f79f2810219a86836b612049676285922b0f983d /TAO/orbsvcs | |
parent | 0b12331fa7974fe65ec16e8ccaa10f8a2616203b (diff) | |
download | ATCD-7cd9ac3770820ee9cef70cfbeace6d7eec8ae396.tar.gz |
ChangeLogTag: Mon Jun 14 09:27:12 2004 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/orbsvcs')
63 files changed, 146 insertions, 81 deletions
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp index b42e0e28b4a..28e2ebd144a 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp @@ -17,6 +17,7 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_unistd.h" #include "tao/Messaging/Messaging.h" #include "tao/IORTable/IORTable.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp index 98846f9745f..30ba12055a6 100644 --- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp +++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp @@ -13,6 +13,7 @@ #include "FT_FaultDetectorFactory_i.h" #include "Fault_Detector_i.h" #include "ace/Get_Opt.h" +#include "ace/OS_NS_unistd.h" #include "orbsvcs/orbsvcs/CosNamingC.h" #include "orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h" diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp index b74352a8f1c..f4d74f9f06a 100644 --- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp +++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp @@ -15,6 +15,7 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_unistd.h" #include "tao/debug.h" // Use this macro at the beginning of CORBA methods diff --git a/TAO/orbsvcs/IFR_Service/drv_args_ifr.cpp b/TAO/orbsvcs/IFR_Service/drv_args_ifr.cpp index c715934ccb4..356c4327ff3 100644 --- a/TAO/orbsvcs/IFR_Service/drv_args_ifr.cpp +++ b/TAO/orbsvcs/IFR_Service/drv_args_ifr.cpp @@ -7,9 +7,10 @@ #include "be_extern.h" #include "ace/Process.h" #include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_unistd.h" -ACE_RCSID (IFR_Service, - drv_args_ifr, +ACE_RCSID (IFR_Service, + drv_args_ifr, "$Id$") extern long DRV_nfiles; @@ -155,13 +156,13 @@ DRV_parse_args (int ac, char *av[]) idl_global->append_idl_flag (av[i+1]); ACE_NEW (buffer, - char[ACE_OS::strlen (av[i]) - + ACE_OS::strlen (av[i + 1]) + char[ACE_OS::strlen (av[i]) + + ACE_OS::strlen (av[i + 1]) + 2]); - ACE_OS::sprintf (buffer, - "%s%s", - av[i], + ACE_OS::sprintf (buffer, + "%s%s", + av[i], av[i+1]); DRV_cpp_putarg (buffer); @@ -185,7 +186,7 @@ DRV_parse_args (int ac, char *av[]) } break; case 'E': - idl_global->set_compile_flags (idl_global->compile_flags () + idl_global->set_compile_flags (idl_global->compile_flags () | IDL_CF_ONLY_PREPROC); break; case 'L': diff --git a/TAO/orbsvcs/IFR_Service/drv_preproc_ifr.cpp b/TAO/orbsvcs/IFR_Service/drv_preproc_ifr.cpp index a118e2bcff5..4108323bce3 100644 --- a/TAO/orbsvcs/IFR_Service/drv_preproc_ifr.cpp +++ b/TAO/orbsvcs/IFR_Service/drv_preproc_ifr.cpp @@ -81,9 +81,11 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ace/ARGV.h" #include "ace/streams.h" #include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_unistd.h" +#include "ace/OS_NS_fcntl.h" -ACE_RCSID (IFR_Service, - drv_preproc_ifr, +ACE_RCSID (IFR_Service, + drv_preproc_ifr, "$Id$") static long argcount = 0; @@ -103,7 +105,7 @@ DRV_cpp_new_location (const char *new_loc) void DRV_cpp_putarg (const char *str) { - if (argcount >= max_argcount) + if (argcount >= max_argcount) { ACE_ERROR ((LM_ERROR, "%s%s %d %s\n", @@ -125,7 +127,7 @@ DRV_cpp_expand_output_arg (const char *filename) if (output_arg_format != 0) { delete [] ACE_const_cast (char *, arglist[output_arg_index]); - arglist[output_arg_index] = 0; + arglist[output_arg_index] = 0; char *output_arg = 0; ACE_NEW (output_arg, @@ -147,7 +149,7 @@ DRV_cpp_init (void) { // @@ There are two "one time" memory leaks in this function. // They will not blow off the program but should be fixed at some point. - const char *cpp_loc; + const char *cpp_loc; const char *cpp_args; // See if TAO_IDL_PREPROCESSOR is defined. @@ -232,7 +234,7 @@ DRV_cpp_init (void) ACE_OS::strcat (option, TAO_IDL_INCLUDE_DIR); #else const char* TAO_ROOT = ACE_OS::getenv ("TAO_ROOT"); - + if (TAO_ROOT != 0) { ACE_OS::strcat (option, TAO_ROOT); @@ -273,7 +275,7 @@ DRV_cpp_init (void) for (size_t arg_cnt = 0; arg_cnt < (size_t)arglist.argc (); ++arg_cnt) { // Check for an argument that specifies the preprocessor's output file. - if (ACE_OS::strstr (arglist[arg_cnt], "%s") != 0 + if (ACE_OS::strstr (arglist[arg_cnt], "%s") != 0 && output_arg_format == 0) { output_arg_format = ACE::strnew (arglist[arg_cnt]); @@ -295,8 +297,8 @@ static char drv_line[LINEBUF_SIZE + 1]; static long DRV_get_line (FILE *f) { - char *l = fgets (drv_line, - LINEBUF_SIZE, + char *l = fgets (drv_line, + LINEBUF_SIZE, f); size_t i = 0; @@ -327,13 +329,13 @@ DRV_get_line (FILE *f) // Copy from stdin to a file static void -DRV_copy_input (FILE *fin, - char *fn, +DRV_copy_input (FILE *fin, + char *fn, const char *orig_filename) { FILE *f = ACE_OS::fopen (fn, "w"); - if (f == NULL) + if (f == NULL) { ACE_ERROR ((LM_ERROR, "%s%s%s%s", @@ -345,7 +347,7 @@ DRV_copy_input (FILE *fin, ACE_OS::exit (99); } - if (fin == NULL) + if (fin == NULL) { ACE_ERROR ((LM_ERROR, "%s%s", @@ -356,8 +358,8 @@ DRV_copy_input (FILE *fin, } #if !defined (ACE_WIN32) - fprintf (f, - "#line 1 \"%s\"\n", + fprintf (f, + "#line 1 \"%s\"\n", orig_filename); #else // Convert single \ into double \ otherwise MSVC++ pre-processor @@ -378,8 +380,8 @@ DRV_copy_input (FILE *fin, } *d = 0; - ACE_OS::fprintf (f, - "#line 1 \"%s\"\n", + ACE_OS::fprintf (f, + "#line 1 \"%s\"\n", buf); #endif /* ! ACE_WIN32 */ @@ -392,8 +394,8 @@ DRV_copy_input (FILE *fin, DRV_check_for_include (drv_line); // Print the line to the temp file. - ACE_OS::fprintf (f, - "%s\n", + ACE_OS::fprintf (f, + "%s\n", drv_line); } @@ -401,7 +403,7 @@ DRV_copy_input (FILE *fin, ACE_OS::fclose (f); } -// Strip down a name to the last component, +// Strip down a name to the last component, // i.e. everything after the last '/' or '\' character static char * DRV_stripped_name (char *fn) @@ -424,7 +426,7 @@ DRV_stripped_name (char *fn) n += 1; - if (slash_found) + if (slash_found) { n += 1; } @@ -478,8 +480,8 @@ DRV_pre_proc (const char *myfile) UTL_String (tmp_ifile)); idl_global->set_real_filename (tmp); - DRV_copy_input (stdin, - tmp_ifile, + DRV_copy_input (stdin, + tmp_ifile, "standard input"); idl_global->set_read_from_stdin (I_TRUE); @@ -487,8 +489,8 @@ DRV_pre_proc (const char *myfile) else { FILE *fd = fopen (myfile, "r"); - DRV_copy_input (fd, - tmp_ifile, + DRV_copy_input (fd, + tmp_ifile, myfile); fclose (fd); @@ -526,7 +528,7 @@ DRV_pre_proc (const char *myfile) DRV_cpp_putarg (0); // Null terminate the arglist. cpp_options.command_line (arglist); - + /// Remove any existing output file. (void) ACE_OS::unlink (tmp_file); @@ -636,7 +638,7 @@ DRV_pre_proc (const char *myfile) FILE *yyin = ACE_OS::fopen (tmp_file, "r"); - if (yyin == NULL) + if (yyin == NULL) { ACE_ERROR ((LM_ERROR, "%s%s %s\n", @@ -649,7 +651,7 @@ DRV_pre_proc (const char *myfile) FE_set_yyin (ACE_reinterpret_cast (File *, yyin)); - if (idl_global->compile_flags() & IDL_CF_ONLY_PREPROC) + if (idl_global->compile_flags() & IDL_CF_ONLY_PREPROC) { FILE *preproc = ACE_OS::fopen (tmp_file, "r"); char buffer[ACE_MAXLOGMSGLEN]; @@ -675,22 +677,22 @@ DRV_pre_proc (const char *myfile) out->clr_flags (ACE_Log_Msg::STDERR); out->set_flags (ACE_Log_Msg::OSTREAM); - while ((bytes = ACE_OS::fread (buffer, - sizeof (char), - ACE_MAXLOGMSGLEN - 1, - preproc)) + while ((bytes = ACE_OS::fread (buffer, + sizeof (char), + ACE_MAXLOGMSGLEN - 1, + preproc)) != 0) { buffer[bytes] = 0; - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, buffer)); } ACE_OS::fclose (preproc); } - if (ACE_OS::unlink (tmp_ifile) == -1) + if (ACE_OS::unlink (tmp_ifile) == -1) { ACE_ERROR ((LM_ERROR, "%s%s %s\n", @@ -702,7 +704,7 @@ DRV_pre_proc (const char *myfile) } #if !defined (ACE_WIN32) || defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0) - if (ACE_OS::unlink (tmp_file) == -1) + if (ACE_OS::unlink (tmp_file) == -1) { ACE_ERROR ((LM_ERROR, "%s%s %s\n", @@ -755,8 +757,8 @@ DRV_check_for_include (const char* buf) // Check whether this word is `include` or no. const char* include_str = "include"; - for (size_t ii = 0; - ii < strlen ("include") && *r != '\0' && *r != ' ' && *r != '\t'; + for (size_t ii = 0; + ii < strlen ("include") && *r != '\0' && *r != ' ' && *r != '\t'; r++, ii++) { // Return if it doesn't match. diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp index 0b73acfb522..f48de6daf17 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp @@ -19,6 +19,7 @@ #include "ace/Auto_Ptr.h" #include "ace/OS_NS_netdb.h" #include "ace/OS_NS_sys_time.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID (ImplRepo_Service, ImR_Activator_i, diff --git a/TAO/orbsvcs/ImplRepo_Service/Server_Repository.cpp b/TAO/orbsvcs/ImplRepo_Service/Server_Repository.cpp index ae1b09da7b4..7ef2dc52637 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Server_Repository.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Server_Repository.cpp @@ -5,11 +5,12 @@ #include "ACEXML/parser/parser/Parser.h" #include "ACEXML/common/FileCharStream.h" +#include "ace/OS_NS_unistd.h" + ACE_RCSID (ImplRepo_Service, Server_Repository, "$Id$") - int Server_Repository::init (void) { @@ -68,7 +69,7 @@ Server_Repository::init (void) // way to store env vars. if (error != 0) - { + { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Error reading configuration data for ") ACE_TEXT ("service '%s',skipping\n"), @@ -156,8 +157,8 @@ Server_Repository::add ( ACE_CString filename = OPTIONS::instance ()->file_name (); FILE *fp = ACE_OS::fopen (filename.c_str(), "r"); - - if (fp != 0) + + if (fp != 0) { ACE_TCHAR buffer[4096]; while (ACE_OS::fgets (buffer, sizeof (buffer), fp)) @@ -472,7 +473,7 @@ Server_Repository::starting_up (const ACE_CString& POA_name) ACE_ASSERT(fp != 0); ACE_TCHAR buffer[4096]; - + while (ACE_OS::fgets (buffer, sizeof (buffer), fp)) { ACE_TCHAR* found = ACE_OS::strstr (buffer, POA_name.c_str ()); diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp index b0bdb4a310f..67500e37945 100644 --- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp @@ -10,6 +10,7 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_netdb.h" #include "ace/OS_NS_strings.h" +#include "ace/OS_NS_unistd.h" // How many servers should we get at once? const size_t IR_LIST_CHUNK = 10; diff --git a/TAO/orbsvcs/PSS/PSDL_Datastore.cpp b/TAO/orbsvcs/PSS/PSDL_Datastore.cpp index f12a2f6a0eb..e11c694f397 100644 --- a/TAO/orbsvcs/PSS/PSDL_Datastore.cpp +++ b/TAO/orbsvcs/PSS/PSDL_Datastore.cpp @@ -4,6 +4,7 @@ #include "PSDL_OctetSeq.h" #include "PSDL_String.h" #include "ace/SString.h" +#include "ace/OS_NS_unistd.h" #include "tao/debug.h" #include "tao/OctetSeqC.h" @@ -158,7 +159,7 @@ TAO_PSDL_Datastore::create_index (void) #endif /* ACE_LACKS_ACCESS */ void *name_obj_map = 0; - + // This is the easy case since if we find hash table in the // memory-mapped file we know it's already initialized. if (this->allocator_->find (TAO_PERSISTENT_NAME_OBJ_MAP, name_obj_map) == 0) diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.cpp b/TAO/orbsvcs/Time_Service/Clerk_i.cpp index f14b54ed484..52a44a27832 100644 --- a/TAO/orbsvcs/Time_Service/Clerk_i.cpp +++ b/TAO/orbsvcs/Time_Service/Clerk_i.cpp @@ -8,6 +8,7 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_string.h" +#include "ace/OS_NS_fcntl.h" #include "ace/os_include/os_netdb.h" ACE_RCSID(Time_Service, Clerk_i, "$Id$") diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp index 9bade030d07..7aff9a4a1bd 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp @@ -3,6 +3,7 @@ // cvs-id : $Id$ #include "ace/Get_Opt.h" +#include "ace/OS_NS_unistd.h" // IOR manipulation. #include "tao/IORManipulation/IORManip_Loader.h" diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp index 51b5f1485e1..3f8b943dba2 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp @@ -11,6 +11,7 @@ ACE_RCSID (Notify, #include "ace/High_Res_Timer.h" #include "ace/Stats.h" #include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_unistd.h" TAO_Notify_ThreadPool_Consumer::TAO_Notify_ThreadPool_Consumer (TAO_Notify_ORB_Objects& orb_objects) : orb_objects_ (orb_objects) diff --git a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp index 41daa2916a6..052a5fe8280 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp +++ b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp @@ -13,6 +13,7 @@ #include "orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h" #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID (EC_Examples, MCast, diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp index 2ad84aaa136..06507936149 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp @@ -18,9 +18,10 @@ #include "ace/Stats.h" #include "ace/Task.h" #include "ace/Barrier.h" +#include "ace/OS_NS_unistd.h" -ACE_RCSID (TAO_RTEC_PERF_RTCORBA_Baseline, - client, +ACE_RCSID (TAO_RTEC_PERF_RTCORBA_Baseline, + client, "$Id$") class Roundtrip_Task : public ACE_Task_Base diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp index 71562c11e2d..a0c6ca5f7ec 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp @@ -24,9 +24,10 @@ #include "ace/Stats.h" #include "ace/Task.h" #include "ace/Barrier.h" +#include "ace/OS_NS_unistd.h" -ACE_RCSID (TAO_PERF_RTEC_RTCORBA_Baseline, - client, +ACE_RCSID (TAO_PERF_RTEC_RTCORBA_Baseline, + client, "$Id$") class Roundtrip_Task : public ACE_Task_Base diff --git a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp index 2298e5bec85..2ba17f41d5b 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp @@ -12,9 +12,10 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" #include "ace/Barrier.h" +#include "ace/OS_NS_unistd.h" -ACE_RCSID (TAO_RTEC_PERF_TCP_Baseline, - client, +ACE_RCSID (TAO_RTEC_PERF_TCP_Baseline, + client, "$Id$") char const * hi_endpoint = "localhost:12345"; diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp index be7b7f2ea18..93760c93800 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp @@ -27,6 +27,7 @@ #include "ace/OS_NS_unistd.h" #include "ace/os_include/os_ctype.h" #include "ace/OS_NS_string.h" +#include "ace/OS_NS_fcntl.h" ACE_RCSID(Concurrency, CC_client, "$Id$") diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp index d1f5cc64d3c..e502874a740 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp @@ -22,9 +22,10 @@ #include "ace/Process.h" #include "orbsvcs/orbsvcs/CosConcurrencyControlC.h" #include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_unistd.h" -ACE_RCSID (Concurrency, - CC_command, +ACE_RCSID (Concurrency, + CC_command, "$Id$") CC_Command::~CC_Command(void) diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp index c2a6af2ac0c..ce3a0ee4b2d 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp @@ -4,9 +4,10 @@ #include "Counting_Supplier.h" #include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h" #include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h" +#include "ace/OS_NS_unistd.h" -ACE_RCSID (CEC_Tests_Basic, - Pull_Push_Event, +ACE_RCSID (CEC_Tests_Basic, + Pull_Push_Event, "$Id$") int diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp index 48bc4698622..a0ebb93aef3 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp @@ -4,9 +4,10 @@ #include "Counting_Supplier.h" #include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h" #include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h" +#include "ace/OS_NS_unistd.h" -ACE_RCSID (CEC_Tests_Basic, - Push_Event, +ACE_RCSID (CEC_Tests_Basic, + Push_Event, "$Id$") int diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp index e63f132d34e..d74044224ce 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp @@ -5,9 +5,10 @@ #include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h" #include "ace/Arg_Shifter.h" #include "ace/OS_NS_strings.h" +#include "ace/OS_NS_unistd.h" -ACE_RCSID (CEC_Tests, - Random, +ACE_RCSID (CEC_Tests, + Random, "$Id$") int diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp index 118bcc8131f..6e3a7cb607a 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp @@ -16,6 +16,7 @@ #include "ace/Auto_Ptr.h" #include "ace/Sched_Params.h" #include "ace/OS_NS_errno.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID (EC_Custom_Marshal, ECM_Consumer, diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp index 3e2e81ea8ef..de6f6b043e3 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp @@ -4,6 +4,7 @@ #include "ace/Auto_Ptr.h" #include "ace/Sched_Params.h" #include "ace/ACE.h" +#include "ace/OS_NS_unistd.h" #include "tao/Timeprobe.h" #include "tao/CDR.h" diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp index 70c0d65a892..67512d83d65 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp @@ -13,6 +13,7 @@ #include "orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h" #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID (EC_MT_Mcast, MCast, @@ -182,7 +183,7 @@ main (int argc, char* argv[]) TAO_ECG_UDP_Out_Endpoint* endpointptr = 0; ACE_NEW_RETURN (endpointptr, TAO_ECG_UDP_Out_Endpoint, 0); - + TAO_ECG_Refcounted_Endpoint endpoint (endpointptr); if (endpoint->dgram ().open (ACE_Addr::sap_any) == -1) { diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp index f7524e538ac..040300b895c 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp +++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp @@ -16,13 +16,14 @@ #include "ace/Sched_Params.h" #include "ace/Read_Buffer.h" #include "ace/OS_NS_sys_time.h" +#include "ace/OS_NS_unistd.h" #if !defined (__ACE_INLINE__) #include "EC_Mcast.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID (EC_Mcast, - EC_Mcast, +ACE_RCSID (EC_Mcast, + EC_Mcast, "$Id$") #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp index 06d0710174d..4012a5b8130 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp @@ -14,9 +14,10 @@ #include "ace/Sched_Params.h" #include "ace/High_Res_Timer.h" #include "ace/ACE.h" +#include "ace/OS_NS_unistd.h" -ACE_RCSID (EC_Throughput, - ECT_Supplier, +ACE_RCSID (EC_Throughput, + ECT_Supplier, "$Id$") #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp index 2829947df81..308906f4f86 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp @@ -3,13 +3,15 @@ #include "Atomic_Reconnect.h" #include "Counting_Supplier.h" +#include "ace/OS_NS_unistd.h" + #include "orbsvcs/orbsvcs/Time_Utilities.h" #include "orbsvcs/orbsvcs/Event_Utilities.h" #include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" -ACE_RCSID (EC_Tests, - Atomic_Reconnect, +ACE_RCSID (EC_Tests, + Atomic_Reconnect, "$Id$") const int event_type = 20; diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.cpp b/TAO/orbsvcs/tests/Event/Basic/Control.cpp index 0ccb01763af..0962fd2b630 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Control.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Control.cpp @@ -3,13 +3,15 @@ #include "Control.h" #include "Counting_Supplier.h" +#include "ace/OS_NS_unistd.h" + #include "orbsvcs/orbsvcs/Time_Utilities.h" #include "orbsvcs/orbsvcs/Event_Utilities.h" #include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" #include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" -ACE_RCSID (EC_Tests, - Control, +ACE_RCSID (EC_Tests, + Control, "$Id$") const int event_type = 20; diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.cpp b/TAO/orbsvcs/tests/Event/Basic/Random.cpp index 44a4f2cb1d2..f7bb82adc85 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Random.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Random.cpp @@ -7,9 +7,10 @@ #include "orbsvcs/orbsvcs/Time_Utilities.h" #include "ace/Arg_Shifter.h" #include "ace/OS_NS_strings.h" +#include "ace/OS_NS_unistd.h" -ACE_RCSID (EC_Tests, - Random, +ACE_RCSID (EC_Tests, + Random, "$Id$") int diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp index 15697f8dc4c..1ef97c20ec3 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp @@ -15,6 +15,7 @@ #include "ace/Array_Base.h" #include "ace/Get_Opt.h" #include "ace/Reactor.h" +#include "ace/OS_NS_unistd.h" #include "ace/os_include/os_netdb.h" // Indicates whether this application is responsible for destroying diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp index 22b59188f7f..a359c8a570e 100644 --- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp @@ -16,6 +16,7 @@ #include "ace/High_Res_Timer.h" #include "ace/Stats.h" #include "ace/OS_NS_errno.h" +#include "ace/OS_NS_unistd.h" #if !defined(EC_DISABLE_OLD_EC) #include "EC_Scheduler_Info.h" diff --git a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp index 980470e28a1..b52311f83be 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp @@ -6,6 +6,7 @@ #include <ace/Get_Opt.h> // FUZZ: disable check_for_streams_include #include "ace/streams.h" +#include "ace/OS_NS_unistd.h" class FTClientMain { diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp index d1c5ca540d9..bfe9a4790e1 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp @@ -13,6 +13,7 @@ #include "FT_ReplicaFactory_i.h" #include "FT_TestReplica_i.h" #include "ace/Get_Opt.h" +#include "ace/OS_NS_unistd.h" #include "orbsvcs/orbsvcs/CosNamingC.h" #include "orbsvcs/orbsvcs/PortableGroupC.h" #include "tao/PortableServer/ORB_Manager.h" diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp index b79e5fe3ce0..57f2789169d 100755 --- a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp @@ -4,6 +4,7 @@ #include <ace/Get_Opt.h> // FUZZ: disable check_for_streams_include #include "ace/streams.h" +#include "ace/OS_NS_unistd.h" // A simple class for building a client that "controls' the // Replication Manager (right now it just shuts it down). diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp index 7d1740af1fb..3cb915df554 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp @@ -9,6 +9,8 @@ #include "orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.h" #include "orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h" #include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_unistd.h" +#include "ace/OS_NS_fcntl.h" // Files which have the IOR const char *first_ior = 0; diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp index 021250ad8d1..8a56f595699 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp @@ -2,6 +2,7 @@ #include "nestea_i.h" #include "tao/debug.h" +#include "ace/ACE.h" #include "ace/FILE_Addr.h" #include "ace/FILE_Connector.h" #include "ace/FILE_IO.h" diff --git a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp index 810fa131ee7..ef95ff4c716 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp @@ -3,7 +3,7 @@ #include "orbsvcs/CosLoadBalancingC.h" #include "orbsvcs/PortableGroup/PG_Operators.h" #include "ace/Get_Opt.h" - +#include "ace/OS_NS_unistd.h" ACE_RCSID (CPU, client, diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp index eab444a49cd..e8f5116c435 100644 --- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp +++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp @@ -8,7 +8,7 @@ #include "ace/Log_Msg.h" #include "ace/SString.h" #include "ace/OS_NS_stdio.h" - +#include "ace/OS_NS_unistd.h" ACE_RCSID (Basic_Log_Test, Basic_Log_Test, diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp index 0a0b8e9c67e..38f8e9002de 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp @@ -3,6 +3,7 @@ #include "AdminProperties.h" #include "ace/Arg_Shifter.h" #include "ace/Get_Opt.h" +#include "ace/OS_NS_unistd.h" #include "tao/debug.h" /***************************************************************************/ diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp index ba478cf5a25..8eed8e3683d 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp @@ -1,7 +1,8 @@ -//$Id$ +// $Id$ #include "ace/Arg_Shifter.h" #include "ace/Get_Opt.h" +#include "ace/OS_NS_unistd.h" #include "tao/debug.h" #include "Sequence.h" diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp index 84254cda87b..c930e066381 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "ace/OS_NS_unistd.h" #include "Notify_Structured_Push_Consumer.h" #include "orbsvcs/orbsvcs/Notify/Notify_Extensions.h" #include "common.h" diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp index 6216ea6a384..bae1c684bf7 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp @@ -5,6 +5,7 @@ // ****************************************************************** #include "ace/Get_Opt.h" +#include "ace/OS_NS_unistd.h" #include "orbsvcs/orbsvcs/CosNotifyCommC.h" #include "orbsvcs/orbsvcs/CosNamingC.h" diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp index ab0fe8d5e43..62d72277ef9 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "ace/OS_NS_unistd.h" #include "Notify_Sequence_Push_Consumer.h" #include "orbsvcs/orbsvcs/TimeBaseC.h" #include "common.h" diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp index 275e5053a08..ba2fb39df56 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "ace/OS_NS_unistd.h" #include "Notify_Structured_Push_Consumer.h" #include "common.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp index e3d7d73870e..8e5713ebb2d 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp @@ -5,6 +5,7 @@ // ****************************************************************** #include "ace/Get_Opt.h" +#include "ace/OS_NS_unistd.h" #include "orbsvcs/orbsvcs/CosNotifyCommC.h" #include "orbsvcs/orbsvcs/CosNamingC.h" diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp index b997fb9f27a..fe185bd3254 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp @@ -5,6 +5,7 @@ // ****************************************************************** #include "ace/Get_Opt.h" +#include "ace/OS_NS_unistd.h" #include "orbsvcs/orbsvcs/CosNotifyCommC.h" #include "orbsvcs/orbsvcs/CosNamingC.h" diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp index edbfadbf441..f6dc8e42ab5 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "ace/OS_NS_unistd.h" #include "Notify_Sequence_Push_Consumer.h" #include "orbsvcs/orbsvcs/TimeBaseC.h" #include "common.h" diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp index b86efc47f25..588d83caffc 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "ace/OS_NS_unistd.h" #include "Notify_Structured_Push_Consumer.h" #include "orbsvcs/orbsvcs/TimeBaseC.h" #include "common.h" diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp index 38ab6945a04..ad410ec2af8 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp @@ -5,6 +5,7 @@ // ****************************************************************** #include "ace/Get_Opt.h" +#include "ace/OS_NS_unistd.h" #include "orbsvcs/orbsvcs/CosNotifyCommC.h" #include "orbsvcs/orbsvcs/CosNamingC.h" diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp index a6fc0e42e2e..0434804c2be 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp @@ -5,6 +5,7 @@ // ****************************************************************** #include "ace/Get_Opt.h" +#include "ace/OS_NS_unistd.h" #include "tao/ORB_Core.h" diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp index 6f778208274..a2c96e61b66 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp @@ -5,6 +5,7 @@ // ****************************************************************** #include "ace/Get_Opt.h" +#include "ace/OS_NS_unistd.h" #include "orbsvcs/orbsvcs/CosNotifyCommC.h" #include "orbsvcs/orbsvcs/CosNamingC.h" diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp index 16e894b6c83..cd1c1b579b4 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp @@ -5,6 +5,7 @@ // ****************************************************************** #include "ace/Get_Opt.h" +#include "ace/OS_NS_unistd.h" #include "tao/ORB_Core.h" diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp index b12d9cdfffe..48250655fee 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "ace/OS_NS_unistd.h" #include "Notify_Sequence_Push_Consumer.h" #include "orbsvcs/orbsvcs/TimeBaseC.h" #include "common.h" diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp index e78dbbd51fa..a2bfacea20d 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp @@ -5,6 +5,7 @@ // ****************************************************************** #include "ace/Get_Opt.h" +#include "ace/OS_NS_unistd.h" #include "orbsvcs/orbsvcs/CosNotifyCommC.h" #include "orbsvcs/orbsvcs/CosNamingC.h" diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp index 58684ce1b19..509fe631c00 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "ace/OS_NS_unistd.h" #include "Notify_Sequence_Push_Consumer.h" #include "orbsvcs/orbsvcs/TimeBaseC.h" #include "common.h" diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp index f621109f7a8..e64fd49f725 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp @@ -5,6 +5,7 @@ // ****************************************************************** #include "ace/Get_Opt.h" +#include "ace/OS_NS_unistd.h" #include "orbsvcs/orbsvcs/CosNotifyCommC.h" #include "orbsvcs/orbsvcs/CosNamingC.h" diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp index f6f3ae6326c..622080e1b27 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp @@ -5,6 +5,7 @@ // ****************************************************************** #include "ace/Get_Opt.h" +#include "ace/OS_NS_unistd.h" #include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h" #include "orbsvcs/orbsvcs/CosNotifyCommC.h" diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp index ef1b3372df7..915ce0f8e61 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp @@ -5,6 +5,7 @@ // ****************************************************************** #include "ace/Get_Opt.h" +#include "ace/OS_NS_unistd.h" #include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h" #include "orbsvcs/orbsvcs/CosNotifyCommC.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp index 1f15ec4b596..283b2268fb5 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp @@ -1,6 +1,7 @@ // $Id$ #include "Activation_Manager.h" +#include "ace/OS_NS_unistd.h" #include "ace/os_include/os_netdb.h" ACE_RCSID (lib, diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp index 308f3f6e459..ded6a360841 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp @@ -5,6 +5,7 @@ #include "ace/Arg_Shifter.h" #include "ace/High_Res_Timer.h" #include "ace/Barrier.h" +#include "ace/OS_NS_unistd.h" #include "tao/debug.h" #include "tao/ORB_Core.h" #include "orbsvcs/orbsvcs/Time_Utilities.h" @@ -14,8 +15,8 @@ #include "LookupManager.h" #include "Priority_Mapping.h" -ACE_RCSID (RT_Notify, - TAO_Notify_Tests_Periodic_Supplier, +ACE_RCSID (RT_Notify, + TAO_Notify_Tests_Periodic_Supplier, "$Id$") TAO_Notify_Tests_Periodic_Supplier::TAO_Notify_Tests_Periodic_Supplier (void) diff --git a/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.cpp b/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.cpp index 62c5cac4000..f964cd99f21 100644 --- a/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.cpp +++ b/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.cpp @@ -14,6 +14,7 @@ #include "ace/ACE.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" +#include "ace/OS_NS_unistd.h" //#include "tao/RTCORBA/RTCORBA.h" ////##include "ace/Task.h" // diff --git a/TAO/orbsvcs/tests/RTCosScheduling/client.cpp b/TAO/orbsvcs/tests/RTCosScheduling/client.cpp index 7a23a74d469..1ad8bfc30f2 100644 --- a/TAO/orbsvcs/tests/RTCosScheduling/client.cpp +++ b/TAO/orbsvcs/tests/RTCosScheduling/client.cpp @@ -17,6 +17,7 @@ #include "tao/debug.h" #include "tao/Version.h" #include "ace/OS_main.h" +#include "ace/OS_NS_unistd.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/TAO/orbsvcs/tests/Time/Client_i.cpp b/TAO/orbsvcs/tests/Time/Client_i.cpp index 04b0293bfd4..dd7c7618ad2 100644 --- a/TAO/orbsvcs/tests/Time/Client_i.cpp +++ b/TAO/orbsvcs/tests/Time/Client_i.cpp @@ -8,6 +8,7 @@ #include "ace/Read_Buffer.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_string.h" +#include "ace/OS_NS_fcntl.h" #include "ace/os_include/os_netdb.h" ACE_RCSID(Time_Service, Client_i, "$Id$") |