9 files changed, 10 insertions, 56 deletions
diff --git a/ACE/ace/XML_Utils/XMLSchema/Traversal.hpp b/ACE/ace/XML_Utils/XMLSchema/Traversal.hpp
index 970e0a6d3eb..3fc320640ac 100644
--- a/ACE/ace/XML_Utils/XMLSchema/Traversal.hpp
+++ b/ACE/ace/XML_Utils/XMLSchema/Traversal.hpp
@@ -69,6 +69,4 @@ namespace XMLSchema
   }
 }
 
-#include <ace/XML_Utils/XMLSchema/Traversal.ipp>
-
 #endif  // XMLSCHEMA_TRAVERSAL_HPP
diff --git a/ACE/ace/XML_Utils/XMLSchema/Traversal.ipp b/ACE/ace/XML_Utils/XMLSchema/Traversal.ipp
deleted file mode 100644
index c96910a60a5..00000000000
--- a/ACE/ace/XML_Utils/XMLSchema/Traversal.ipp
+++ /dev/null
@@ -1,9 +0,0 @@
-// file      : XMLSchema/Traversal.ipp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-
-namespace XMLSchema
-{
-  namespace Traversal
-  {
-  }
-}
diff --git a/ACE/ace/XML_Utils/XMLSchema/TypeInfo.hpp b/ACE/ace/XML_Utils/XMLSchema/TypeInfo.hpp
index 2016982b73b..75da2c30ad6 100644
--- a/ACE/ace/XML_Utils/XMLSchema/TypeInfo.hpp
+++ b/ACE/ace/XML_Utils/XMLSchema/TypeInfo.hpp
@@ -14,7 +14,6 @@ namespace XMLSchema
   };
 }
 
-#include <ace/XML_Utils/XMLSchema/TypeInfo.ipp>
 #include <ace/XML_Utils/XMLSchema/TypeInfo.tpp>
 
 #endif  // XMLSCHEMA_TYPE_INFO_HPP
diff --git a/ACE/ace/XML_Utils/XMLSchema/TypeInfo.ipp b/ACE/ace/XML_Utils/XMLSchema/TypeInfo.ipp
deleted file mode 100644
index 20cce1f97be..00000000000
--- a/ACE/ace/XML_Utils/XMLSchema/TypeInfo.ipp
+++ /dev/null
@@ -1,6 +0,0 @@
-// file      : XMLSchema/TypeInfo.ipp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-
-namespace XMLSchema
-{
-}
diff --git a/ACE/ace/XML_Utils/XMLSchema/Types.hpp b/ACE/ace/XML_Utils/XMLSchema/Types.hpp
index 9027786a834..966c588fd3e 100644
--- a/ACE/ace/XML_Utils/XMLSchema/Types.hpp
+++ b/ACE/ace/XML_Utils/XMLSchema/Types.hpp
@@ -57,8 +57,6 @@ namespace XMLSchema
     typedef basic_string<C> Base__ ;
 
   public:
-    //    typedef ACE_Refcounted_Auto_Ptr < string, ACE_Null_Mutex > _ptr;
-
     //@@ VC6 does not inject XSCRT::Type into the scope so I have
     //   to qualify it all the time.
     //
@@ -662,6 +660,4 @@ namespace XMLSchema
   };
 }
 
-#include "ace/XML_Utils/XMLSchema/Types.ipp"
-
 #endif  // XMLSCHEMA_TYPES_HPP
diff --git a/ACE/ace/XML_Utils/XMLSchema/Types.ipp b/ACE/ace/XML_Utils/XMLSchema/Types.ipp
deleted file mode 100644
index b39e46a39ee..00000000000
--- a/ACE/ace/XML_Utils/XMLSchema/Types.ipp
+++ /dev/null
@@ -1,7 +0,0 @@
-// file      : XMLSchema/Types.ipp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-
-namespace XMLSchema
-{
-
-}
diff --git a/ACE/ace/XML_Utils/XMLSchema/Writer.hpp b/ACE/ace/XML_Utils/XMLSchema/Writer.hpp
index 781432b8fda..5a12ce2ff2a 100644
--- a/ACE/ace/XML_Utils/XMLSchema/Writer.hpp
+++ b/ACE/ace/XML_Utils/XMLSchema/Writer.hpp
@@ -151,6 +151,4 @@ namespace XMLSchema
   }
 }
 
-#include <ace/XML_Utils/XMLSchema/Writer.ipp>
-
 #endif  // XMLSCHEMA_WRITER_HPP
diff --git a/ACE/ace/XML_Utils/XMLSchema/Writer.ipp b/ACE/ace/XML_Utils/XMLSchema/Writer.ipp
deleted file mode 100644
index 98078da9298..00000000000
--- a/ACE/ace/XML_Utils/XMLSchema/Writer.ipp
+++ /dev/null
@@ -1,9 +0,0 @@
-// file      : XMLSchema/Writer.ipp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-
-namespace XMLSchema
-{
-  namespace Writer
-  {
-  }
-}
diff --git a/ACE/ace/XML_Utils/XMLSchema/id_map.hpp b/ACE/ace/XML_Utils/XMLSchema/id_map.hpp
index 6cdcbe45a13..559d461665f 100644
--- a/ACE/ace/XML_Utils/XMLSchema/id_map.hpp
+++ b/ACE/ace/XML_Utils/XMLSchema/id_map.hpp
@@ -89,7 +89,6 @@
       {
         throw NULL_PTR_Entry();
       }
-        return;
     }
 
     // Add an IDREF to the IDREF map
@@ -103,7 +102,6 @@
       {
         throw NULL_PTR_Entry();
       }
-      return;
     }
 
     void resolve_single_idref (const std::basic_string<ACE_TCHAR>& idref, ::XSCRT::Type * element)
@@ -124,27 +122,23 @@
     //Note: The pointer is of type "XSCRT::Type*"
     void resolve_idref ( void )
     {
-      //Declare iterators to navigate the maps
-      ID_Map::id_iterator id_iterator;
-      ID_Map::idref_iterator idref_iterator;
-
-      for (idref_iterator = this->idref_map_.begin();
+      // Declare iterators to navigate the maps
+      for (ID_Map::idref_iterator idref_iterator = this->idref_map_.begin();
            idref_iterator != this->idref_map_.end();
            ++idref_iterator)
       {
         //Find the ID that matches the IDREF element
-        id_iterator = this->id_map_.find(idref_iterator->first);
+        ID_Map::id_iterator id_iterator = this->id_map_.find(idref_iterator->first);
         if (id_iterator != this->id_map_.end())
         {
-          //Add the IDREF identifier and the reference to the
-          //identified object
+          // Add the IDREF identifier and the reference to the
+          // identified object
           std::basic_string<ACE_TCHAR> temp_id = id_iterator->first;
           idref_iterator->second->set_idref(temp_id, id_iterator->second);
         }
         else
         {
-          std::basic_string<ACE_TCHAR> temp (idref_iterator->first);
-          throw Unresolved_IDREF(temp);
+          throw Unresolved_IDREF(idref_iterator->first);
         }
       }
     }
@@ -156,11 +150,11 @@
     }
 
     private:
-    //id_map_: maps the ID string to the element with the
-    //         ID attribute
+    /// Maps the ID string to the element with the
+    /// ID attribute
     ID_MAP id_map_;
-    //idref_map_: multimap that maps the IDREF string to the
-    //            element with the IDREF attribute
+    /// Multimap that maps the IDREF string to the
+    /// element with the IDREF attribute
     IDREF_MAP idref_map_;
   };