diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-03-03 07:34:32 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-03-03 07:34:32 +0000 |
| commit | 8f6fc4101f1d534d6a5fda72c421057434f6326a (patch) | |
| tree | 1eb4004c68d4faae0937428bffbb06f362d1d70c | |
| parent | a7a55da8d4cec4f7ad58157a2ba4503f6120912f (diff) | |
| download | ATCD-8f6fc4101f1d534d6a5fda72c421057434f6326a.tar.gz | |
ChangeLogTag: Thu Mar 3 07:32:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/examples/POA/DSI/Database.idl | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/TAO/examples/POA/DSI/Database.idl b/TAO/examples/POA/DSI/Database.idl index 4487ee4b236..b2b0b21cb2b 100644 --- a/TAO/examples/POA/DSI/Database.idl +++ b/TAO/examples/POA/DSI/Database.idl @@ -70,6 +70,6 @@ module Database raises (Unknown_Type, Unknown_Key); - void shutdown (); + oneway void shutdown (); }; }; diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp index ccb4b02fde3..989f91e119b 100644 --- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp +++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp @@ -22,8 +22,11 @@ #include "tao/debug.h" #include "ace/OS_main.h" #include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_unistd.h" -ACE_RCSID(Concurrency_Service, Concurrency_Service, "$Id$") +ACE_RCSID(Concurrency_Service, + Concurrency_Service, + "$Id$") // Default Constructor. @@ -118,10 +121,10 @@ Concurrency_Service::init (int argc, "The IOR is: <%s>\n", ACE_TEXT_CHAR_TO_TCHAR(str.in ()))); - if (this->ior_file_name_ != 0) + if (this->ior_file_name_ != 0) { FILE* iorf = ACE_OS::fopen (ior_file_name_, ACE_LIB_TEXT("w")); - if (iorf == 0) + if (iorf == 0) { ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", @@ -133,10 +136,10 @@ Concurrency_Service::init (int argc, ACE_OS::fclose (iorf); } - if (this->pid_file_name_ != 0) + if (this->pid_file_name_ != 0) { FILE* pidf = ACE_OS::fopen (pid_file_name_, ACE_LIB_TEXT("w")); - if (pidf != 0) + if (pidf != 0) { ACE_OS::fprintf (pidf, "%ld\n", |