Bug 1634281 - Make nsDataHashtable a type alias. r=xpcom-reviewers,nika

Differential Revision: https://phabricator.services.mozilla.com/D105961
dothq · Mar 4, 2021 · 3004f1f · 3004f1f
1 parent 6da5224
commit 3004f1f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 18 deletions.
diff --git a/xpcom/ds/nsDataHashtable.h b/xpcom/ds/nsDataHashtable.h
@@ -12,21 +12,4 @@
 // Not used here, but included for convenience.
 #include "nsHashKeys.h"
 
-/**
- * templated hashtable class maps keys to simple datatypes.
- * See nsBaseHashtable for complete declaration
- * @param KeyClass a wrapper-class for the hashtable key, see nsHashKeys.h
- *   for a complete specification.
- * @param DataType the simple datatype being wrapped
- * @see nsInterfaceHashtable, nsClassHashtable
- *
- * XXX This could be made a type alias instead of a subclass, but all forward
- * declarations must be adjusted.
- */
-template <class KeyClass, class DataType>
-class nsDataHashtable : public nsBaseHashtable<KeyClass, DataType, DataType> {
- public:
-  using nsBaseHashtable<KeyClass, DataType, DataType>::nsBaseHashtable;
-};
-
 #endif  // nsDataHashtable_h__
diff --git a/xpcom/ds/nsHashtablesFwd.h b/xpcom/ds/nsHashtablesFwd.h
@@ -24,8 +24,16 @@ class nsBaseHashtable;
 template <class KeyClass, class T>
 class nsClassHashtable;
 
+/**
+ * templated hashtable class maps keys to simple datatypes.
+ * See nsBaseHashtable for complete declaration
+ * @param KeyClass a wrapper-class for the hashtable key, see nsHashKeys.h
+ *   for a complete specification.
+ * @param DataType the simple datatype being wrapped
+ * @see nsInterfaceHashtable, nsClassHashtable
+ */
 template <class KeyClass, class DataType>
-class nsDataHashtable;
+using nsDataHashtable = nsBaseHashtable<KeyClass, DataType, DataType>;
 
 template <class KeyClass, class Interface>
 class nsInterfaceHashtable;