Mon Aug 9 15:14:43 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * ACEXML/apps/svcconf/Svcconf_Handler.cpp:
          Zap emulated exception macros

        * ace/config-macros.h:
          Only define ACE_HAS_EXCEPTIONS when it is not defined yet

3 files changed, 30 insertions, 24 deletions

diff --git a/ACE/ACEXML/apps/svcconf/Svcconf_Handler.cpp b/ACE/ACEXML/apps/svcconf/Svcconf_Handler.cpp
index 9d687c486ce..d6aa84dbe8c 100644
--- a/ACE/ACEXML/apps/svcconf/Svcconf_Handler.cpp
+++ b/ACE/ACEXML/apps/svcconf/Svcconf_Handler.cpp
@@ -76,7 +76,7 @@ ACEXML_Svcconf_Handler::endElement (const ACEXML_Char *,
           msg += ACE_TString (active_info->name ());
           msg += ACE_TString (ACE_TEXT ("'\n"));
 
-          ACEXML_THROW (ACEXML_SAXException (msg.c_str ()));
+          throw ACEXML_SAXException (msg.c_str ());
         }
 
       void *(*func) (ACE_Service_Object_Exterminator *) = 0;
@@ -96,7 +96,7 @@ ACEXML_Svcconf_Handler::endElement (const ACEXML_Char *,
           msg += ACE_TString (active_info->name ());
           msg += ACE_TString (ACE_TEXT ("'\n"));
 
-          ACEXML_THROW (ACEXML_SAXException (msg.c_str ()));
+          throw ACEXML_SAXException (msg.c_str ());
         }
       symbol = (*func)(&gobbler); // target object created in the loaded DLL.
 
@@ -127,7 +127,7 @@ ACEXML_Svcconf_Handler::endElement (const ACEXML_Char *,
               msg += ACE_TString (active_info->name ());
               msg += ACE_TString (ACE_TEXT ("'\n"));
 
-              ACEXML_THROW (ACEXML_SAXException (msg.c_str ()));
+              throw ACEXML_SAXException (msg.c_str ());
             }
 
           this->stream_svc_type_ =
@@ -165,7 +165,7 @@ ACEXML_Svcconf_Handler::endElement (const ACEXML_Char *,
                   msg += ACE_TString (active_info->name ());
                   msg += ACE_TString (ACE_TEXT ("'\n"));
 
-                  ACEXML_THROW (ACEXML_SAXException (msg.c_str ()));
+                  throw ACEXML_SAXException (msg.c_str ());
                 }
 
 
@@ -197,7 +197,7 @@ ACEXML_Svcconf_Handler::endElement (const ACEXML_Char *,
                   msg += ACE_TString (active_info->name ());
                   msg += ACE_TString (ACE_TEXT ("'\n"));
 
-                  ACEXML_THROW (ACEXML_SAXException (msg.c_str ()));
+                  throw ACEXML_SAXException (msg.c_str ());
                 }
             }
           this->parsed_info_.reset ();
@@ -233,7 +233,7 @@ ACEXML_Svcconf_Handler::endElement (const ACEXML_Char *,
                   msg += ACE_TString (this->parsed_info_.name ());
                   msg += ACE_TString (ACE_TEXT ("'\n"));
 
-                  ACEXML_THROW (ACEXML_SAXException (msg.c_str ()));
+                  throw ACEXML_SAXException (msg.c_str ());
                 }
             }
           this->parsed_info_.reset ();
@@ -338,7 +338,7 @@ ACEXML_Svcconf_Handler::startElement (const ACEXML_Char *,
           msg += ACE_TString (this->stream_info_.name ());
           msg += ACE_TString (ACE_TEXT ("'\n"));
 
-          ACEXML_THROW (ACEXML_SAXException (msg.c_str ()));
+          throw ACEXML_SAXException (msg.c_str ());
         }
       this->stream_ =   this->stream_svc_type_ == 0
         ? 0
@@ -376,7 +376,7 @@ ACEXML_Svcconf_Handler::startElement (const ACEXML_Char *,
               msg += ACE_TString (this->parsed_info_.name ());
               msg += ACE_TString (ACE_TEXT ("'\n"));
 
-              ACEXML_THROW (ACEXML_SAXException (msg.c_str ()));
+              throw ACEXML_SAXException (msg.c_str ());
             }
 
           mt->resume ();
@@ -393,7 +393,7 @@ ACEXML_Svcconf_Handler::startElement (const ACEXML_Char *,
               msg += ACE_TString (this->parsed_info_.name ());
               msg += ACE_TString (ACE_TEXT ("'\n"));
 
-              ACEXML_THROW (ACEXML_SAXException (msg.c_str ()));
+              throw ACEXML_SAXException (msg.c_str ());
             }
         }
       this->parsed_info_.reset ();
@@ -417,7 +417,7 @@ ACEXML_Svcconf_Handler::startElement (const ACEXML_Char *,
               msg += ACE_TString (this->parsed_info_.name ());
               msg += ACE_TString (ACE_TEXT ("'\n"));
 
-              ACEXML_THROW (ACEXML_SAXException (msg.c_str ()));
+              throw ACEXML_SAXException (msg.c_str ());
             }
 
           mt->suspend ();
@@ -434,7 +434,7 @@ ACEXML_Svcconf_Handler::startElement (const ACEXML_Char *,
               msg += ACE_TString (this->parsed_info_.name ());
               msg += ACE_TString (ACE_TEXT ("'\n"));
 
-              ACEXML_THROW (ACEXML_SAXException (msg.c_str ()));
+              throw ACEXML_SAXException (msg.c_str ());
             }
         }
       this->parsed_info_.reset ();
@@ -458,7 +458,7 @@ ACEXML_Svcconf_Handler::startElement (const ACEXML_Char *,
               msg += ACE_TString (this->parsed_info_.name ());
               msg += ACE_TString (ACE_TEXT ("'\n"));
 
-              ACEXML_THROW (ACEXML_SAXException (msg.c_str ()));
+              throw ACEXML_SAXException (msg.c_str ());
             }
 
           this->stream_->remove (mt);
@@ -475,7 +475,7 @@ ACEXML_Svcconf_Handler::startElement (const ACEXML_Char *,
               msg += ACE_TString (this->parsed_info_.name ());
               msg += ACE_TString (ACE_TEXT ("'\n"));
 
-              ACEXML_THROW (ACEXML_SAXException (msg.c_str ()));
+              throw ACEXML_SAXException (msg.c_str ());
             }
         }
       this->parsed_info_.reset ();
@@ -580,8 +580,7 @@ ACEXML_Svcconf_Handler::get_stream_id (ACEXML_Attributes *alist)
             msg += ACE_TString (this->stream_info_.name ());
             msg += ACE_TString (ACE_TEXT ("'\n"));
 
-            ACEXML_THROW_RETURN (ACEXML_SAXException (msg.c_str ()),
-                                 -1);
+            throw ACEXML_SAXException (msg.c_str ());
           }
       }
   return 0;
@@ -607,8 +606,7 @@ ACEXML_Svcconf_Handler::get_id (ACEXML_Attributes *alist)
             msg += ACE_TString (this->parsed_info_.name ());
             msg += ACE_TString (ACE_TEXT ("'\n"));
 
-            ACEXML_THROW_RETURN (ACEXML_SAXException (msg.c_str ()),
-                            -1);
+            throw ACEXML_SAXException (msg.c_str ());
           }
       }
   return 0;
@@ -648,8 +646,7 @@ ACEXML_Svcconf_Handler::get_dynamic_attrs (ACEXML_Attributes *alist)
                   msg += ACE_TString (info->name ());
                   msg += ACE_TString (ACE_TEXT ("'\n"));
 
-                  ACEXML_THROW_RETURN (ACEXML_SAXException (msg.c_str ()),
-                                       -1);
+                  throw ACEXML_SAXException (msg.c_str ());
                 }
             }
           else if (ACE_OS::strcmp (alist->getQName (i), ACE_TEXT ("type")) == 0)
@@ -675,8 +672,7 @@ ACEXML_Svcconf_Handler::get_dynamic_attrs (ACEXML_Attributes *alist)
                   msg += ACE_TString (info->name ());
                   msg += ACE_TString (ACE_TEXT ("'\n"));
 
-                  ACEXML_THROW_RETURN (ACEXML_SAXException (msg.c_str ()),
-                                  -1);
+                  throw ACEXML_SAXException (msg.c_str ());
                 }
             }
           else
@@ -688,7 +684,7 @@ ACEXML_Svcconf_Handler::get_dynamic_attrs (ACEXML_Attributes *alist)
               msg += ACE_TString (info->name ());
               msg += ACE_TString (ACE_TEXT ("'\n"));
 
-              ACEXML_THROW_RETURN (ACEXML_SAXException (msg.c_str ()), -1);
+              throw ACEXML_SAXException (msg.c_str ());
             }
         }
     }
@@ -726,7 +722,7 @@ ACEXML_Svcconf_Handler::get_initializer_attrs (ACEXML_Attributes *alist)
               msg += ACE_TString (info->name ());
               msg += ACE_TString (ACE_TEXT ("'\n"));
 
-              ACEXML_THROW_RETURN (ACEXML_SAXException (msg.c_str ()), -1);
+              throw ACEXML_SAXException (msg.c_str ());
             }
         }
     }
@@ -760,7 +756,7 @@ ACEXML_Svcconf_Handler::get_static_attrs (ACEXML_Attributes *alist)
               msg += ACE_TString (info->name ());
               msg += ACE_TString (ACE_TEXT ("'\n"));
 
-              ACEXML_THROW_RETURN (ACEXML_SAXException (msg.c_str ()), -1);
+              throw ACEXML_SAXException (msg.c_str ());
             }
         }
     }
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 0594dc57ff8..11e3af2792f 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,11 @@
+Mon Aug  9 15:14:43 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ACEXML/apps/svcconf/Svcconf_Handler.cpp:
+          Zap emulated exception macros
+
+        * ace/config-macros.h:
+          Only define ACE_HAS_EXCEPTIONS when it is not defined yet
+
 Mon Aug  9 06:38:34 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/config-sunos5.5.h:
diff --git a/ACE/ace/config-macros.h b/ACE/ace/config-macros.h
index 7f5af7c8fc9..ba8de9bcb9d 100644
--- a/ACE/ace/config-macros.h
+++ b/ACE/ace/config-macros.h
@@ -26,7 +26,9 @@
 #include "ace/Version.h"
 #include "ace/Versioned_Namespace.h"
 
+#if !defined (ACE_HAS_EXCEPTIONS)
 #define ACE_HAS_EXCEPTIONS
+#endif /* !ACE_HAS_EXCEPTIONS */
 
 // ACE_HAS_TLI is used to decide whether to try any XTI/TLI functionality
 // so if it isn't set, set it. Capabilities and differences between