ChangeLogTag: Thu Sep 29 06:44:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

3 files changed, 24 insertions, 19 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index a87ec93503d..000d5d86d96 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,8 @@
+Thu Sep 29 06:44:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tools/Config_Handlers/Utils/XML_Schema_Resolver.h:
+          Added missing pre.h
+
 Wed Sep 28 16:44:39 2005  Gan Deng  <dengg@dre.vanderbilt.edu>
 
 	* docs/schema/CIAOServerResources.xsd
@@ -11,7 +16,7 @@ Wed Sep 28 14:44:39 2005  William Otte  <wotte@dre.vanderbilt.edu>
 
 	New version of the XSC including additional features needed for
 	RT-CCM.
-	
+
 Wed Sep 28 08:24:32 2005  William Otte  <wotte@dre.vanderbilt.edu>
 
 	* tools/Config_Handlers/Utils/Utils.mpc
@@ -21,7 +26,7 @@ Wed Sep 28 08:24:32 2005  William Otte  <wotte@dre.vanderbilt.edu>
 
 	Implemented a schema resolver so that the XML parser till grab the
 	schemata from $CIAO_ROOT/docs/schema.
-	
+
 	* docs/tutorials/Quoter/Simple/descriptors/Deployment.xsd
 	* docs/tutorials/Quoter/Simple/descriptors/Modified_Deployment.xsd
 	* examples/BasicSP/descriptors/Deployment.xsd
@@ -35,7 +40,7 @@ Wed Sep 28 08:24:32 2005  William Otte  <wotte@dre.vanderbilt.edu>
 	* examples/Hello/descriptors/XMI.xsd
 
 	Removed obsolete schemata.
-	
+
 	* examples/Display/descriptors/flattened_deploymentplan.cdp
 	* examples/Hello/descriptors/flattened_deploymentplan.cdp
 	* examples/Hello/descriptors/flattened_deploymentplan_without_ns.cdp
@@ -47,7 +52,7 @@ Wed Sep 28 08:24:32 2005  William Otte  <wotte@dre.vanderbilt.edu>
 	* NEWS
 
 	Updated the NEWS to include this feature.
-	
+
 Tue Sep 27 13:16:43 2005  William Otte  <wotte@dre.vanderbilt.edu>
 
 	* DAnCE/ExecutionManager/ExecutionManager.mpc
@@ -63,14 +68,14 @@ Tue Sep 27 13:16:43 2005  William Otte  <wotte@dre.vanderbilt.edu>
 	* ciao/CCM_Core.mpc
 	* examples/BasicSP/BasicSP.mpc
 
-	Fixed a large number of deficiencies in our build structure. 
-	More changes to come later. 
-	
+	Fixed a large number of deficiencies in our build structure.
+	More changes to come later.
+
 Tue Sep 27 11:10:37 2005  William Otte  <wotte@dre.vanderbilt.edu>
 
 	* NEWS
 
-	Updated the news file. 
+	Updated the news file.
 
 Tue Sep 27 10:51:20 2005  William Otte  <wotte@dre.vanderbilt.edu>
 
diff --git a/TAO/CIAO/tools/Config_Handlers/Utils/XML_Schema_Resolver.h b/TAO/CIAO/tools/Config_Handlers/Utils/XML_Schema_Resolver.h
index 9fd86000588..c80d82e7193 100644
--- a/TAO/CIAO/tools/Config_Handlers/Utils/XML_Schema_Resolver.h
+++ b/TAO/CIAO/tools/Config_Handlers/Utils/XML_Schema_Resolver.h
@@ -8,8 +8,8 @@
  */
 
 #ifndef CIAO_CONFIG_HANDLERS_XML_SCHEAM_RESOLVER_H
-#define  CIAO_CONFIG_HANDLERS_XML_SCHEAM_RESOLVER_H
-
+#define CIAO_CONFIG_HANDLERS_XML_SCHEAM_RESOLVER_H
+#include /**/ "ace/pre.h"
 
 #include "Config_Handlers_Export.h"
 
@@ -43,18 +43,18 @@ namespace CIAO
 
       /// If this constructor is passed a nonempty string, it locates
       /// the schema in that path, otherwise its behavior is the same
-      /// as the default constructor. 
+      /// as the default constructor.
       CIAO_Schema_Resolver (const char *path);
-      
+
       /// This function is called by the Xerces infrastructure to
       /// actually resolve the location of a schema.
-      virtual DOMInputSource * resolveEntity (const XMLCh *const publicId, 
+      virtual DOMInputSource * resolveEntity (const XMLCh *const publicId,
                                               const XMLCh *const systemId,
                                               const XMLCh *const baseURI);
-      
+
     private:
       std::string resolve_from_environment (void);
-      
+
       std::string base_path_;
     };
   }
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
index 92143556226..6b9a9a48be3 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
@@ -70,23 +70,23 @@ TAO_LB_ServerRequestInterceptor::receive_request_service_contexts (
 
           CORBA::Boolean byte_order;
           if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
-            ACE_THROW (CORBA::BAD_PARAM ());
+            ACE_TRY_THROW (CORBA::BAD_PARAM ());
 
           cdr.reset_byte_order (static_cast<int> (byte_order));
 
           CORBA::Object_var object_group;
           if (cdr >> object_group.out ())
-            ACE_THROW (PortableInterceptor::ForwardRequest (object_group.in (),
+            ACE_TRY_THROW (PortableInterceptor::ForwardRequest (object_group.in (),
                                                             0));
           else
-            ACE_THROW (CORBA::BAD_PARAM ());
+            ACE_TRY_THROW (CORBA::BAD_PARAM ());
           */
 
           // A ServiceContext of the given ServiceId exists.  This
           // means that the target is load balanced.  Force the client
           // to try another profile since this location is currently
           // overloaded.
-          ACE_THROW (CORBA::TRANSIENT ());
+          ACE_TRY_THROW (CORBA::TRANSIENT ());
         }
       ACE_CATCH (CORBA::BAD_PARAM, ex)
         {