Additional work for CPPXT-40.

[shibboleth/xmltooling.git] / xmltooling / Namespace.h

diff --git a/xmltooling/Namespace.h b/xmltooling/Namespace.h
index 9a1b55a..a948477 100644 (file)
--- a/xmltooling/Namespace.h
+++ b/xmltooling/Namespace.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2007 Internet2
+ *  Copyright 2001-2009 Internet2
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 
 /**
- * @file Namespace.h
+ * @file xmltooling/Namespace.h
  * 
  * Representing XML namespace attributes 
  */
@@ -47,19 +47,7 @@ namespace xmltooling {
         Namespace(const XMLCh* uri=NULL, const XMLCh* prefix=NULL, bool alwaysDeclare=false);
         
         ~Namespace();
-#ifndef HAVE_GOOD_STL
-        /**
-         * Deep copy constructor
-         */
-        Namespace(const Namespace& src);
-
-        /**
-         * Deep assignment operator
-         */
-        Namespace& operator=(const Namespace& src);
-#endif
         
-#ifdef HAVE_GOOD_STL
         /**
          * Returns the namespace prefix
          * @return  Null-terminated Unicode string containing the prefix, without the colon
@@ -71,19 +59,6 @@ namespace xmltooling {
          * @return  Null-terminated Unicode string containing the URI
          */
         const XMLCh* getNamespaceURI() const { return m_uri.c_str(); }
-#else
-        /**
-         * Returns the namespace prefix
-         * @return  Null-terminated Unicode string containing the prefix, without the colon
-         */
-        const XMLCh* getNamespacePrefix() const { return m_prefix; }
-
-        /**
-         * Returns the namespace URI
-         * @return  Null-terminated Unicode string containing the URI
-         */
-        const XMLCh* getNamespaceURI() const { return m_uri; }
-#endif
 
         /**
          * Returns true iff the namespace should always be declared regardless of in-scope declarations
@@ -111,13 +86,8 @@ namespace xmltooling {
         
     private:
         bool m_pinned;
-#ifdef HAVE_GOOD_STL
         xstring m_uri;
         xstring m_prefix;
-#else
-        XMLCh* m_uri;
-        XMLCh* m_prefix;
-#endif
     };
 
 #if defined (_MSC_VER)