Wed Aug 4 14:43:14 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * orbsvcs/orbsvcs/Notify/XML_Loader.h:
        * orbsvcs/orbsvcs/Notify/XML_Loader.cpp:
          Fixed compile errors

3 files changed, 11 insertions, 6 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index a361b98ef49..d765e7a7b0a 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,9 @@
+Wed Aug  4 14:43:14 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Notify/XML_Loader.h:
+        * orbsvcs/orbsvcs/Notify/XML_Loader.cpp:
+          Fixed compile errors
+
 Wed Aug  4 13:10:21 UTC 2010  Marcel Smit  <msmit@remedy.nl>
 
         * tao/SystemException.cpp:
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
index c438ce4656e..adb507e2400 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
@@ -146,10 +146,9 @@ namespace TAO_Notify
       try
       {
         object_stack_.push (root);
-        parser.parse (&input ACEXML_ENV_ARG_PARAMETER);
-        ACEXML_TRY_CHECK;
+        parser.parse (&input);
         ACE_ASSERT (object_stack_.size () == 1);
-        Topology_Object* cur;
+        Topology_Object* cur = 0;
         object_stack_.pop (cur);
       }
       catch (const ACEXML_Exception& ex)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h
index e0af94e4f76..ccf66a66324 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h
@@ -58,11 +58,11 @@ public:
   virtual void startElement (const ACEXML_Char* namespaceURI,
     const ACEXML_Char* localName,
     const ACEXML_Char* qName,
-    ACEXML_Attributes* atts ACEXML_ENV_ARG_DECL);
+    ACEXML_Attributes* atts);
 
   virtual void endElement (const ACEXML_Char*,
     const ACEXML_Char*,
-    const ACEXML_Char* name ACEXML_ENV_ARG_DECL_NOT_USED);
+    const ACEXML_Char* name);
 
 private:
   /// The name of the file from which data is read.
@@ -72,7 +72,7 @@ private:
 
   typedef ACE_Unbounded_Stack<Topology_Object*> TopoStack;
   TopoStack object_stack_;
-  /// if false, then we're just checking syntax of topology file.
+  /// If false, then we're just checking syntax of topology file.
   bool live_;
 };