Bug 716338 - Use FAIL_ON_WARNINGS in content/html/content/src. r=bz
authorMounir Lamouri <mounir.lamouri@gmail.com>
Mon, 09 Jan 2012 18:58:30 +0100
changeset 84046 8e12454829d3b934d6c0bdb78469b27a67292bf0
parent 84045 cf15bf30ba2cb6c5f1fd0a58e56934f51737b7a5
child 84047 a477a8579ead9f7a1f458c5440764c71eee76cae
push id4697
push usermlamouri@mozilla.com
push dateMon, 09 Jan 2012 18:13:04 +0000
treeherdermozilla-inbound@a477a8579ead [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbz
bugs716338
milestone12.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 716338 - Use FAIL_ON_WARNINGS in content/html/content/src. r=bz
content/html/content/src/Makefile.in
content/html/content/src/nsHTMLMenuItemElement.h
xpcom/glue/nsBaseHashtable.h
--- a/content/html/content/src/Makefile.in
+++ b/content/html/content/src/Makefile.in
@@ -40,16 +40,17 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= content
 LIBRARY_NAME	= gkconhtmlcon_s
 LIBXUL_LIBRARY	= 1
+FAIL_ON_WARNINGS = 1
 
 
 EXPORTS		= \
 		nsClientRect.h \
 		nsHTMLDNSPrefetch.h \
 		$(NULL)
 
 CPPSRCS		= \
--- a/content/html/content/src/nsHTMLMenuItemElement.h
+++ b/content/html/content/src/nsHTMLMenuItemElement.h
@@ -38,16 +38,18 @@
 #include "nsGenericHTMLElement.h"
 
 class Visitor;
 
 class nsHTMLMenuItemElement : public nsGenericHTMLElement,
                               public nsIDOMHTMLMenuItemElement
 {
 public:
+  using nsGenericElement::GetText;
+
   nsHTMLMenuItemElement(already_AddRefed<nsINodeInfo> aNodeInfo,
                         mozilla::dom::FromParser aFromParser);
   virtual ~nsHTMLMenuItemElement();
 
   /** Typesafe, non-refcounting cast from nsIContent.  Cheaper than QI. **/
   static nsHTMLMenuItemElement* FromContent(nsIContent* aContent)
   {
     if (aContent && aContent->IsHTML(nsGkAtoms::menuitem)) {
--- a/xpcom/glue/nsBaseHashtable.h
+++ b/xpcom/glue/nsBaseHashtable.h
@@ -130,29 +130,29 @@ public:
 
     if (pData)
       *pData = ent->mData;
 
     return true;
   }
 
   /**
-   * For pointer types, get the value, returning NULL if the entry is not
+   * For pointer types, get the value, returning nsnull if the entry is not
    * present in the table.
    *
    * @param aKey the key to retrieve
-   * @return The found value, or NULL if no entry was found with the given key.
-   * @note If NULL values are stored in the table, it is not possible to
-   *       distinguish between a NULL value and a missing entry.
+   * @return The found value, or nsnull if no entry was found with the given key.
+   * @note If nsnull values are stored in the table, it is not possible to
+   *       distinguish between a nsnull value and a missing entry.
    */
   UserDataType Get(KeyType aKey) const
   {
     EntryType* ent = this->GetEntry(aKey);
     if (!ent)
-      return NULL;
+      return nsnull;
 
     return ent->mData;
   }
 
   /**
    * put a new value for the associated key
    * @param aKey the key to put
    * @param aData the new data
@@ -256,28 +256,28 @@ public:
   typedef size_t
     (* SizeOfEntryExcludingThisFun)(KeyType           aKey,
                                     const DataType    &aData,
                                     nsMallocSizeOfFun mallocSizeOf,
                                     void*             userArg);
 
   /**
    * Measure the size of the table's entry storage, and if
-   * |sizeOfEntryExcludingThis| is non-NULL, measure the size of things pointed
+   * |sizeOfEntryExcludingThis| is non-nsnull, measure the size of things pointed
    * to by entries.
    * 
    * @param     sizeOfEntryExcludingThis the
    *            <code>SizeOfEntryExcludingThisFun</code> function to call
    * @param     mallocSizeOf the function used to measure heap-allocated blocks
    * @param     userArg a pointer to pass to the
    *            <code>SizeOfEntryExcludingThisFun</code> function
    * @return    the summed size of all the entries
    */
   size_t SizeOfExcludingThis(SizeOfEntryExcludingThisFun sizeOfEntryExcludingThis,
-                             nsMallocSizeOfFun mallocSizeOf, void *userArg = NULL)
+                             nsMallocSizeOfFun mallocSizeOf, void *userArg = nsnull)
   {
     if (IsInitialized()) {
       s_SizeOfArgs args = { sizeOfEntryExcludingThis, userArg };
       return PL_DHashTableSizeOfExcludingThis(&this->mTable,
                                               s_SizeOfStub,
                                               mallocSizeOf,
                                               &args);
     }