Bug 928351 - Fixed -Wshadow warning.
authorJacek Caban <jacek@codeweavers.com>
Mon, 10 Mar 2014 14:32:24 +0100
changeset 172780 7b8c2a48d08bf8642ee5cc5187b5b65e2ced1e24
parent 172779 cdb9a5b0d4b9c86c188da9b2079b739ba457afe6
child 172781 738dafa8f97fd6366744c32829431ed16475807a
push id26380
push userryanvm@gmail.com
push dateMon, 10 Mar 2014 20:53:14 +0000
treeherdermozilla-central@20e2ef50fa8b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs928351
milestone30.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 928351 - Fixed -Wshadow warning.
mfbt/Char16.h
--- a/mfbt/Char16.h
+++ b/mfbt/Char16.h
@@ -61,18 +61,18 @@
    */
 class char16ptr_t
 {
   private:
     const char16_t* ptr;
     static_assert(sizeof(char16_t) == sizeof(wchar_t), "char16_t and wchar_t sizes differ");
 
   public:
-    char16ptr_t(const char16_t* ptr) : ptr(ptr) {}
-    char16ptr_t(const wchar_t* ptr) : ptr(reinterpret_cast<const char16_t*>(ptr)) {}
+    char16ptr_t(const char16_t* p) : ptr(p) {}
+    char16ptr_t(const wchar_t* p) : ptr(reinterpret_cast<const char16_t*>(p)) {}
 
     /* Without this, nullptr assignment would be ambiguous. */
     constexpr char16ptr_t(decltype(nullptr)) : ptr(nullptr) {}
 
     operator const char16_t*() const {
       return ptr;
     }
     operator const wchar_t*() const {