Back out 00fc7e525678 (bug 803543) for debug Mac build bustage

CLOSED TREE

content/smil/SMILBoolType.h

@@ -42,10 +42,8 @@ protected:
 private:
   // Private constructor & destructor: prevent instances beyond my singleton,
   // and prevent others from deleting my singleton.
-  MOZ_CONSTEXPR SMILBoolType() {}
-#ifdef DEBUG
+  SMILBoolType()  {}
   ~SMILBoolType() {}
-#endif
 };
 
 } // namespace mozilla

content/smil/SMILEnumType.h

@@ -43,10 +43,8 @@ protected:
 private:
   // Private constructor & destructor: prevent instances beyond my singleton,
   // and prevent others from deleting my singleton.
-  MOZ_CONSTEXPR SMILEnumType() {}
-#ifdef DEBUG
+  SMILEnumType()  {}
   ~SMILEnumType() {}
-#endif
 };
 
 } // namespace mozilla

content/smil/SMILIntegerType.h

@@ -37,10 +37,7 @@ public:
   }
 
 private:
-  MOZ_CONSTEXPR SMILIntegerType() {}
-#ifdef DEBUG
-  ~SMILIntegerType() {}
-#endif
+  SMILIntegerType() {}
 };
 
 } // namespace mozilla

content/smil/SMILStringType.h

@@ -43,10 +43,8 @@ protected:
 private:
   // Private constructor & destructor: prevent instances beyond my singleton,
   // and prevent others from deleting my singleton.
-  MOZ_CONSTEXPR SMILStringType() {}
-#ifdef DEBUG
+  SMILStringType()  {}
   ~SMILStringType() {}
-#endif
 };
 
 } // namespace mozilla

content/smil/nsISMILType.h

@@ -6,7 +6,6 @@
 #ifndef NS_ISMILTYPE_H_
 #define NS_ISMILTYPE_H_
 
-#include "mozilla/Attributes.h"
 #include "nscore.h"
 
 class nsSMILValue;
@@ -213,17 +212,8 @@ protected:
    * Protected destructor, to ensure that no one accidentally deletes an
    * instance of this class.
    * (The only instances in existence should be singletons - one per subclass.)
-   *
-   * This destructor and the destructors of subclasses are only defined in
-   * debug builds.  For non-debug builds, we let the compiler define the
-   * default (public) constructor.  The compiler understands that the default
-   * destructor doesn't necessarily need to be invoked (e.g. if there are no
-   * members to destroy) and so will avoid creating static destructors (and
-   * registering them with static *constructors*) in non-debug builds.
    */
-#ifdef DEBUG
   ~nsISMILType() {}
-#endif
 };
 
 #endif // NS_ISMILTYPE_H_

content/smil/nsSMILCSSValueType.h

@@ -100,10 +100,8 @@ public:
 private:
   // Private constructor & destructor: prevent instances beyond my singleton,
   // and prevent others from deleting my singleton.
-  MOZ_CONSTEXPR nsSMILCSSValueType() {}
-#ifdef DEBUG
+  nsSMILCSSValueType()  {}
   ~nsSMILCSSValueType() {}
-#endif
 };
 
 #endif // NS_SMILCSSVALUETYPE_H_

content/smil/nsSMILFloatType.h

@@ -41,10 +41,8 @@ protected:
 private:
   // Private constructor & destructor: prevent instances beyond my singleton,
   // and prevent others from deleting my singleton.
-  MOZ_CONSTEXPR nsSMILFloatType() {}
-#ifdef DEBUG
+  nsSMILFloatType()  {}
   ~nsSMILFloatType() {}
-#endif
 };
 
 #endif // NS_SMILFLOATTYPE_H_

content/smil/nsSMILNullType.h

@@ -44,10 +44,8 @@ protected:
 private:
   // Private constructor & destructor: prevent instances beyond my singleton,
   // and prevent others from deleting my singleton.
-  MOZ_CONSTEXPR nsSMILNullType() {}
-#ifdef DEBUG
+  nsSMILNullType()  {}
   ~nsSMILNullType() {}
-#endif
 };
 
 #endif // NS_SMILNULLTYPE_H_

content/svg/content/src/SVGIntegerPairSMILType.h

@@ -45,10 +45,8 @@ protected:
 private:
   // Private constructor & destructor: prevent instances beyond my singleton,
   // and prevent others from deleting my singleton.
-  MOZ_CONSTEXPR SVGIntegerPairSMILType() {}
-#ifdef DEBUG
+  SVGIntegerPairSMILType()  {}
   ~SVGIntegerPairSMILType() {}
-#endif
 };
 
 } // namespace mozilla

content/svg/content/src/SVGLengthListSMILType.h

@@ -93,10 +93,8 @@ protected:
 private:
   // Private constructor & destructor: prevent instances beyond my singleton,
   // and prevent others from deleting my singleton.
-  MOZ_CONSTEXPR SVGLengthListSMILType() {}
-#ifdef DEBUG
+  SVGLengthListSMILType() {}
   ~SVGLengthListSMILType() {}
-#endif
 };
 
 } // namespace mozilla

content/svg/content/src/SVGMotionSMILType.h

@@ -73,10 +73,8 @@ public:
 private:
   // Private constructor & destructor: prevent instances beyond my singleton,
   // and prevent others from deleting my singleton.
-  MOZ_CONSTEXPR SVGMotionSMILType() {}
-#ifdef DEBUG
+  SVGMotionSMILType()  {}
   ~SVGMotionSMILType() {}
-#endif
 };
 
 } // namespace mozilla

content/svg/content/src/SVGNumberListSMILType.h

@@ -47,10 +47,8 @@ protected:
 private:
   // Private constructor & destructor: prevent instances beyond my singleton,
   // and prevent others from deleting my singleton.
-  MOZ_CONSTEXPR SVGNumberListSMILType() {}
-#ifdef DEBUG
+  SVGNumberListSMILType() {}
   ~SVGNumberListSMILType() {}
-#endif
 };
 
 } // namespace mozilla

content/svg/content/src/SVGNumberPairSMILType.h

@@ -40,10 +40,8 @@ protected:
 private:
   // Private constructor & destructor: prevent instances beyond my singleton,
   // and prevent others from deleting my singleton.
-  MOZ_CONSTEXPR SVGNumberPairSMILType() {}
-#ifdef DEBUG
+  SVGNumberPairSMILType()  {}
   ~SVGNumberPairSMILType() {}
-#endif
 };
 
 } // namespace mozilla

content/svg/content/src/SVGOrientSMILType.h

@@ -60,10 +60,8 @@ protected:
 private:
   // Private constructor & destructor: prevent instances beyond my singleton,
   // and prevent others from deleting my singleton.
-  MOZ_CONSTEXPR SVGOrientSMILType() {}
-#ifdef DEBUG
+  SVGOrientSMILType()  {}
   ~SVGOrientSMILType() {}
-#endif
 };
 
 } // namespace mozilla

content/svg/content/src/SVGPathSegListSMILType.h

@@ -51,10 +51,8 @@ protected:
 private:
   // Private constructor & destructor: prevent instances beyond my singleton,
   // and prevent others from deleting my singleton.
-  MOZ_CONSTEXPR SVGPathSegListSMILType() {}
-#ifdef DEBUG
+  SVGPathSegListSMILType() {}
   ~SVGPathSegListSMILType() {}
-#endif
 };
 
 } // namespace mozilla

content/svg/content/src/SVGPointListSMILType.h

@@ -47,10 +47,8 @@ protected:
 private:
   // Private constructor & destructor: prevent instances beyond my singleton,
   // and prevent others from deleting my singleton.
-  MOZ_CONSTEXPR SVGPointListSMILType() {}
-#ifdef DEBUG
+  SVGPointListSMILType() {}
   ~SVGPointListSMILType() {}
-#endif
 };
 
 } // namespace mozilla

content/svg/content/src/SVGTransformListSMILType.h

@@ -123,10 +123,8 @@ public:
 private:
   // Private constructor & destructor: prevent instances beyond my singleton,
   // and prevent others from deleting my singleton.
-  MOZ_CONSTEXPR SVGTransformListSMILType() {}
-#ifdef DEBUG
+  SVGTransformListSMILType() {}
   ~SVGTransformListSMILType() {}
-#endif
 };
 
 } // end namespace mozilla

content/svg/content/src/SVGViewBoxSMILType.h

@@ -40,10 +40,8 @@ protected:
 private:
   // Private constructor & destructor: prevent instances beyond my singleton,
   // and prevent others from deleting my singleton.
-  MOZ_CONSTEXPR SVGViewBoxSMILType() {}
-#ifdef DEBUG
+  SVGViewBoxSMILType()  {}
   ~SVGViewBoxSMILType() {}
-#endif
 };
 
 } // namespace mozilla