ChangeLogTag: Sun Nov 28 18:16:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>

2 files changed, 37 insertions, 25 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index a6d515ee683..c5697ce8d2b 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,37 +1,43 @@
+Sun Nov 28 18:16:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/RTCosScheduling/Object1_i.{h,cpp}:
+          Replaced throw with ACE_THROW_SPEC to fix compile problems with
+          building without native excption support
+
 Sun Nov 28 18:00:30 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
  	* tao/IORInterceptor/IORInterceptor.pidl:
 
 	  Added some documentation for applying diffs.
-	
+
 	* tao/IORInterceptor/IORInterceptorC.h:
 
-	  Cosmetic hand craft to minimize the number of lines of diffs. 
-	
+	  Cosmetic hand craft to minimize the number of lines of diffs.
+
 	* tao/IORInterceptor/diff/IORInterceptor.diff:
 
 	  New file for maintenence.
 
 Sun Nov 28 17:41:37 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
-	* tao/IORInterceptor/IORInterceptor.h:	
+	* tao/IORInterceptor/IORInterceptor.h:
 
 	  A new header file which can be included by trhe applications to
-	  pull in IORInterceptor symbols even in static mode. 
-	
+	  pull in IORInterceptor symbols even in static mode.
+
 	* tao/IORInterceptor/IORInterceptorC.cpp:
 	* tao/IORInterceptor/IORInterceptorC.h:
 
 	  Regenerated the files with our standard  trick to prevent
-	  applications including this file directly. 
-	
+	  applications including this file directly.
+
 	* tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp:
 	* tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h:
 	* tao/IORInterceptor/IORInterceptor_Adapter_Impl.h:
 	* tao/IORInterceptor/IORInterceptor_List.h:
 
-	  Reduced inter-header dependancies. 
-	
+	  Reduced inter-header dependancies.
+
  	* orbsvcs/examples/ORT/Server_IORInterceptor.h:
 	* orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h:
 	* tests/ORT/ORT_test_IORInterceptor.h:
diff --git a/TAO/orbsvcs/tests/RTCosScheduling/server.cpp b/TAO/orbsvcs/tests/RTCosScheduling/server.cpp
index ae46946ce65..c9f93d5baea 100644
--- a/TAO/orbsvcs/tests/RTCosScheduling/server.cpp
+++ b/TAO/orbsvcs/tests/RTCosScheduling/server.cpp
@@ -26,14 +26,15 @@
 #include "ace/Get_Opt.h"
 #include "tao/ORB_Core.h"
 #include "ace/OS_main.h"
+#include "ace/OS_NS_stdio.h"
 
-
-char *node_        = NULL;
-char *file_        = NULL;
-char *shared_file_ = NULL;
-char *object_      = NULL;
+const char *ior_output_file = "server.ior";
+char *node_        = 0;
+char *file_        = 0;
+char *shared_file_ = 0;
+char *object_      = 0;
 int num_threads_   = 5;
-int use_realtime_    = 1;
+int use_realtime_  = 1;
 
 // ORB Thread
 
@@ -105,13 +106,13 @@ parse_args (int argc, char *argv[])
 
         }
      }
-  if (node_ == NULL)
+  if (node_ == 0)
     node_ = ACE_OS::strdup("1");
-  if (file_ == NULL)
+  if (file_ == 0)
     file_ = ACE_OS::strdup("schedule.cfg");
-  if (shared_file_ == NULL)
+  if (shared_file_ == 0)
     shared_file_ = ACE_OS::strdup("Scheduling_Service_Shared_Memory");
-  if (object_ == NULL)
+  if (object_ == 0)
     object_ = ACE_OS::strdup("Server2");
 
   return 0;
@@ -199,9 +200,15 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) {
       ACE_TRY_CHECK;
 
 
-      ofstream server_IOR_file ("server.ior");
-      server_IOR_file << testObject_IORString.in () << endl;
-
+      // If the ior_output_file exists, output the ior to it
+      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      if (output_file == 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Cannot open output file for writing IOR: %s",
+                           ior_output_file),
+                              1);
+      ACE_OS::fprintf (output_file, "%s", testObject_IORString.in ());
+      ACE_OS::fclose (output_file);
 
       if (use_realtime_)
         {
@@ -220,8 +227,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) {
           ACE_ENDTRY;
         }
 
-
-      /// Activate the manager and run the event loop
+      // Activate the manager and run the event loop
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
 
       // Need to set the main thread pthread scope and pthread policy to