Bug 812531: Make MOZ_TYPE_SPECIFIC_SCOPED_POINTER_TEMPLATE comply with...

Bug 812531: Make MOZ_TYPE_SPECIFIC_SCOPED_POINTER_TEMPLATE comply with two-phase template name lookup rules, as clang requires, r=khuey

--HG--
extra : rebase_source : 5c4c8c0ff4f2dfcb4d83e63376036a5bf45ab0ab

mfbt/Scoped.h

@@ -247,9 +247,11 @@ SCOPED_TEMPLATE(ScopedDeleteArray, ScopedDeleteArrayTraits)
  *   } // file is closed with PR_Close here
  */
 #define MOZ_TYPE_SPECIFIC_SCOPED_POINTER_TEMPLATE(name, Type, Deleter) \
-inline void TypeSpecificDelete(Type * value) { Deleter(value); } \
+template <> inline void TypeSpecificDelete(Type * value) { Deleter(value); } \
 typedef ::mozilla::TypeSpecificScopedPointer<Type> name;
 
+template <typename T> void TypeSpecificDelete(T * value);
+
 template <typename T>
 struct TypeSpecificScopedPointerTraits
 {

security/manager/ssl/src/ScopedNSSTypes.h

@@ -16,6 +16,8 @@
 #include "pk11pub.h"
 #include "sechash.h"
 
+namespace mozilla {
+
 // Alphabetical order by NSS type
 MOZ_TYPE_SPECIFIC_SCOPED_POINTER_TEMPLATE(ScopedPRFileDesc,
                                           PRFileDesc,
@@ -74,5 +76,6 @@ MOZ_TYPE_SPECIFIC_SCOPED_POINTER_TEMPLATE(ScopedSECKEYPublicKey,
                                           SECKEYPublicKey,
                                           SECKEY_DestroyPublicKey)
 
+} // namespace mozilla
 
 #endif // mozilla_ScopedNSSTypes_h