diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-01-13 19:57:05 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-01-13 19:57:05 +0000 |
| commit | 780615626f320d89e2d4a669bdd0eca13022a08b (patch) | |
| tree | 740081d62ca0c2ac144d20c3d63ea384d59d644b | |
| parent | 80be2c2a25ad6f2c2d56c8540561ecae6ad947e0 (diff) | |
| download | ATCD-780615626f320d89e2d4a669bdd0eca13022a08b.tar.gz | |
ChangeLogTag:Thu Jan 13 11:55:55 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 10 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp | 21 |
2 files changed, 22 insertions, 9 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 32953112226..6637a2384b2 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,13 @@ +Thu Jan 13 11:55:55 2005 Ossama Othman <ossama@dre.vanderbilt.edu> + + * orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp: + + Include "ace/OS_NS_unistd.h" to pull in ACE_OS::getpid() + declaration. + + Replaced ACE_static_cast macro usage with standard C++ + static_cast<>. + Thu Jan 13 11:52:55 2005 Ossama Othman <ossama@dre.vanderbilt.edu> * orbsvcs/tests/Concurrency/CC_command.cpp (execute): diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp index 7aeb345a52b..6ccc6668388 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp @@ -25,9 +25,12 @@ #include "ace/Get_Opt.h" #include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_unistd.h" #include "tao/debug.h" -ACE_RCSID (CosEvent, Event_Loader, "$Id$") +ACE_RCSID (CosEvent, + Event_Loader, + "$Id$") TAO_CEC_Event_Loader::TAO_CEC_Event_Loader (void) { @@ -218,21 +221,21 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, ACE_TRY_CHECK; FILE *iorf = ACE_OS::fopen (ior_file, ACE_LIB_TEXT("w")); - if (iorf != 0) + if (iorf != 0) { ACE_OS::fprintf (iorf, "%s\n", ior.in ()); ACE_OS::fclose (iorf); } } - if (pid_file != 0) + if (pid_file != 0) { FILE *pidf = ACE_OS::fopen (pid_file, "w"); if (pidf != 0) { - ACE_OS::fprintf (pidf, + ACE_OS::fprintf (pidf, "%ld\n", - ACE_static_cast (long, ACE_OS::getpid ())); + static_cast<long> (ACE_OS::getpid ())); ACE_OS::fclose (pidf); } } @@ -353,21 +356,21 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, ACE_TRY_CHECK; FILE *iorf = ACE_OS::fopen (ior_file, "w"); - if (iorf != 0) + if (iorf != 0) { ACE_OS::fprintf (iorf, "%s\n", ior.in ()); ACE_OS::fclose (iorf); } } - if (pid_file != 0) + if (pid_file != 0) { FILE *pidf = ACE_OS::fopen (pid_file, "w"); if (pidf != 0) { - ACE_OS::fprintf (pidf, + ACE_OS::fprintf (pidf, "%ld\n", - ACE_static_cast (long, ACE_OS::getpid ())); + static_cast<long> (ACE_OS::getpid ())); ACE_OS::fclose (pidf); } } |