Merge remote branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / contrib / ldapc++ / src / LDAPUrlList.h

diff --git a/contrib/ldapc++/src/LDAPUrlList.h b/contrib/ldapc++/src/LDAPUrlList.h
index 3f905e42a2d78a2990f2b7c96ca784d109bb1898..6c9def958a1e9575ee685dcaa54598e356dd2ac7 100644 (file)
--- a/contrib/ldapc++/src/LDAPUrlList.h
+++ b/contrib/ldapc++/src/LDAPUrlList.h
@@ -1,5 +1,6 @@
+// $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2012 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -9,17 +10,17 @@
 #include <list>
 #include <LDAPUrl.h>
 
-typedef std::list<LDAPUrl> UrlList;
-
 /**
  * This container class is used to store multiple LDAPUrl-objects.
  */
 class LDAPUrlList{
+    typedef std::list<LDAPUrl> ListType;
+
     public:
-       typedef UrlList::const_iterator const_iterator;
+       typedef ListType::const_iterator const_iterator;
 
         /**
-         * Constructs an empty std::list.
+         * Constructs an empty list.
          */   
         LDAPUrlList();
 
@@ -32,7 +33,7 @@ class LDAPUrlList{
          * For internal use only
          *
          * This constructor is used by the library internally to create a
-         * std::list of URLs from a array of C-std::strings that was return by
+         * std::list of URLs from a array of C-strings that was return by
          * the C-API
          */
         LDAPUrlList(char** urls);
@@ -72,6 +73,6 @@ class LDAPUrlList{
         void add(const LDAPUrl& url);
 
     private :
-        UrlList m_urls;
+        ListType m_urls;
 };
 #endif //LDAP_URL_LIST_H