corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 711647 - Add MOZ_DELETE to a bunch of deliberately-not-implemented methods across the tree. r=dbaron

Browse Source
This commit is contained in:
Jeff Walden
2011-12-16 14:42:07 -05:00
parent e74c3ca49c
commit edbb60f3de
30 changed files with 144 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
content/base/src/nsAttrAndChildArray.h
View File

@@ -44,6 +44,8 @@
#ifndef nsAttrAndChildArray_h___ #ifndef nsAttrAndChildArray_h___
#define nsAttrAndChildArray_h___ #define nsAttrAndChildArray_h___
#include "mozilla/Attributes.h"
#include "nscore.h" #include "nscore.h"
#include "nsAttrName.h" #include "nsAttrName.h"
#include "nsAttrValue.h" #include "nsAttrValue.h"
@@ -136,8 +138,8 @@ public:
PRInt64 SizeOf() const; PRInt64 SizeOf() const;
private: private:
nsAttrAndChildArray(const nsAttrAndChildArray& aOther); // Not to be implemented nsAttrAndChildArray(const nsAttrAndChildArray& aOther) MOZ_DELETE;
nsAttrAndChildArray& operator=(const nsAttrAndChildArray& aOther); // Not to be implemented nsAttrAndChildArray& operator=(const nsAttrAndChildArray& aOther) MOZ_DELETE;
void Clear(); void Clear();

6
gfx/thebes/gfxQuartzNativeDrawing.h
View File

@@ -38,6 +38,8 @@
#ifndef _GFXQUARTZNATIVEDRAWING_H_ #ifndef _GFXQUARTZNATIVEDRAWING_H_
#define _GFXQUARTZNATIVEDRAWING_H_ #define _GFXQUARTZNATIVEDRAWING_H_
#include "mozilla/Attributes.h"
#include "gfxContext.h" #include "gfxContext.h"
#include "gfxQuartzSurface.h" #include "gfxQuartzSurface.h"
@@ -71,8 +73,8 @@ public:
private: private:
// don't allow copying via construction or assignment // don't allow copying via construction or assignment
gfxQuartzNativeDrawing(const gfxQuartzNativeDrawing&); gfxQuartzNativeDrawing(const gfxQuartzNativeDrawing&) MOZ_DELETE;
const gfxQuartzNativeDrawing& operator=(const gfxQuartzNativeDrawing&); const gfxQuartzNativeDrawing& operator=(const gfxQuartzNativeDrawing&) MOZ_DELETE;
// Final destination context // Final destination context
nsRefPtr<gfxContext> mContext; nsRefPtr<gfxContext> mContext;

6
js/public/Vector.h
View File

@@ -41,6 +41,8 @@
#ifndef jsvector_h_ #ifndef jsvector_h_
#define jsvector_h_ #define jsvector_h_
#include "mozilla/Attributes.h"
#include "TemplateLib.h" #include "TemplateLib.h"
#include "Utility.h" #include "Utility.h"
@@ -274,8 +276,8 @@ class Vector : private AllocPolicy
bool entered; bool entered;
#endif #endif
Vector(const Vector &); Vector(const Vector &) MOZ_DELETE;
Vector &operator=(const Vector &); Vector &operator=(const Vector &) MOZ_DELETE;
/* private accessors */ /* private accessors */

6
js/src/ds/LifoAlloc.h
View File

@@ -41,6 +41,8 @@
#ifndef LifoAlloc_h__ #ifndef LifoAlloc_h__
#define LifoAlloc_h__ #define LifoAlloc_h__
#include "mozilla/Attributes.h"
/* /*
* This data structure supports stacky LIFO allocation (mark/release and * This data structure supports stacky LIFO allocation (mark/release and
* LifoAllocScope). It does not maintain one contiguous segment; instead, it * LifoAllocScope). It does not maintain one contiguous segment; instead, it
@@ -181,8 +183,8 @@ class LifoAlloc
size_t markCount; size_t markCount;
size_t defaultChunkSize_; size_t defaultChunkSize_;
void operator=(const LifoAlloc &); void operator=(const LifoAlloc &) MOZ_DELETE;
LifoAlloc(const LifoAlloc &); LifoAlloc(const LifoAlloc &) MOZ_DELETE;
/* /*
* Return a BumpChunk that can perform an allocation of at least size |n| * Return a BumpChunk that can perform an allocation of at least size |n|

7
js/src/jscompartment.h
View File

@@ -40,6 +40,8 @@
#ifndef jscompartment_h___ #ifndef jscompartment_h___
#define jscompartment_h___ #define jscompartment_h___
#include "mozilla/Attributes.h"
#include "jsclist.h" #include "jsclist.h"
#include "jscntxt.h" #include "jscntxt.h"
#include "jsfun.h" #include "jsfun.h"
@@ -469,9 +471,8 @@ class AutoCompartment
void leave(); void leave();
private: private:
// Prohibit copying. AutoCompartment(const AutoCompartment &) MOZ_DELETE;
AutoCompartment(const AutoCompartment &); AutoCompartment & operator=(const AutoCompartment &) MOZ_DELETE;
AutoCompartment & operator=(const AutoCompartment &);
}; };
/* /*

7
js/src/vm/Debugger.h
View File

@@ -42,6 +42,8 @@
#ifndef Debugger_h__ #ifndef Debugger_h__
#define Debugger_h__ #define Debugger_h__
#include "mozilla/Attributes.h"
#include "jsapi.h" #include "jsapi.h"
#include "jsclist.h" #include "jsclist.h"
#include "jscntxt.h" #include "jscntxt.h"
@@ -348,9 +350,8 @@ class Debugger {
JSObject *wrapScript(JSContext *cx, JSScript *script); JSObject *wrapScript(JSContext *cx, JSScript *script);
private: private:
/* Prohibit copying. */ Debugger(const Debugger &) MOZ_DELETE;
Debugger(const Debugger &); Debugger & operator=(const Debugger &) MOZ_DELETE;
Debugger & operator=(const Debugger &);
}; };
class BreakpointSite { class BreakpointSite {

12
js/xpconnect/loader/mozJSComponentLoader.cpp
View File

@@ -41,6 +41,8 @@
* *
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
#include "mozilla/Attributes.h"
#ifdef MOZ_LOGGING #ifdef MOZ_LOGGING
#define FORCE_PR_LOG #define FORCE_PR_LOG
#endif #endif
@@ -319,8 +321,8 @@ private:
char* mBuf; char* mBuf;
// prevent copying and assignment // prevent copying and assignment
JSCLContextHelper(const JSCLContextHelper &); // not implemented JSCLContextHelper(const JSCLContextHelper &) MOZ_DELETE;
const JSCLContextHelper& operator=(const JSCLContextHelper &); // not implemented const JSCLContextHelper& operator=(const JSCLContextHelper &) MOZ_DELETE;
}; };
@@ -334,9 +336,9 @@ public:
private: private:
JSContext* mContext; JSContext* mContext;
JSErrorReporter mOldReporter; JSErrorReporter mOldReporter;
// prevent copying and assignment
JSCLAutoErrorReporterSetter(const JSCLAutoErrorReporterSetter &); // not implemented JSCLAutoErrorReporterSetter(const JSCLAutoErrorReporterSetter &) MOZ_DELETE;
const JSCLAutoErrorReporterSetter& operator=(const JSCLAutoErrorReporterSetter &); // not implemented const JSCLAutoErrorReporterSetter& operator=(const JSCLAutoErrorReporterSetter &) MOZ_DELETE;
}; };
static nsresult static nsresult

6
js/xpconnect/src/xpcprivate.h
View File

@@ -46,6 +46,8 @@
#ifndef xpcprivate_h___ #ifndef xpcprivate_h___
#define xpcprivate_h___ #define xpcprivate_h___
#include "mozilla/Attributes.h"
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdarg.h> #include <stdarg.h>
@@ -4024,8 +4026,8 @@ private:
MOZILLA_DECL_USE_GUARD_OBJECT_NOTIFIER MOZILLA_DECL_USE_GUARD_OBJECT_NOTIFIER
// No copying or assignment allowed // No copying or assignment allowed
AutoScriptEvaluate(const AutoScriptEvaluate &); AutoScriptEvaluate(const AutoScriptEvaluate &) MOZ_DELETE;
AutoScriptEvaluate & operator =(const AutoScriptEvaluate &); AutoScriptEvaluate & operator =(const AutoScriptEvaluate &) MOZ_DELETE;
}; };
/***************************************************************************/ /***************************************************************************/

9
layout/base/nsCSSFrameConstructor.h
View File

@@ -43,6 +43,8 @@
#ifndef nsCSSFrameConstructor_h___ #ifndef nsCSSFrameConstructor_h___
#define nsCSSFrameConstructor_h___ #define nsCSSFrameConstructor_h___
#include "mozilla/Attributes.h"
#include "nsCOMPtr.h" #include "nsCOMPtr.h"
#include "nsILayoutHistoryState.h" #include "nsILayoutHistoryState.h"
#include "nsIXBLService.h" #include "nsIXBLService.h"
@@ -102,10 +104,9 @@ public:
nsIAtom* aTag, // content object's tag nsIAtom* aTag, // content object's tag
nsXPIDLString& aAltText); nsXPIDLString& aAltText);
private: private:
// These are not supported and are not implemented! nsCSSFrameConstructor(const nsCSSFrameConstructor& aCopy) MOZ_DELETE;
nsCSSFrameConstructor(const nsCSSFrameConstructor& aCopy); nsCSSFrameConstructor& operator=(const nsCSSFrameConstructor& aCopy) MOZ_DELETE;
nsCSSFrameConstructor& operator=(const nsCSSFrameConstructor& aCopy);
public: public:
// XXXbz this method needs to actually return errors! // XXXbz this method needs to actually return errors!

4
layout/base/nsStyleChangeList.h
View File

@@ -43,6 +43,8 @@
#ifndef nsStyleChangeList_h___ #ifndef nsStyleChangeList_h___
#define nsStyleChangeList_h___ #define nsStyleChangeList_h___
#include "mozilla/Attributes.h"
#include "nsError.h" #include "nsError.h"
#include "nsChangeHint.h" #include "nsChangeHint.h"
@@ -95,7 +97,7 @@ protected:
nsStyleChangeData mBuffer[kStyleChangeBufferSize]; nsStyleChangeData mBuffer[kStyleChangeBufferSize];
private: private:
nsStyleChangeList(const nsStyleChangeList&); // not implemented nsStyleChangeList(const nsStyleChangeList&) MOZ_DELETE;
}; };

3
layout/generic/nsFrame.cpp
View File

@@ -42,6 +42,7 @@
/* base class of all rendering objects */ /* base class of all rendering objects */
#include "mozilla/Attributes.h"
#include "mozilla/Util.h" #include "mozilla/Util.h"
#include "nsCOMPtr.h" #include "nsCOMPtr.h"
@@ -8074,7 +8075,7 @@ struct DR_FrameTypeInfo
char mName[32]; char mName[32];
nsTArray<DR_Rule*> mRules; nsTArray<DR_Rule*> mRules;
private: private:
DR_FrameTypeInfo& operator=(const DR_FrameTypeInfo&); // NOT USED DR_FrameTypeInfo& operator=(const DR_FrameTypeInfo&) MOZ_DELETE;
}; };
DR_FrameTypeInfo::DR_FrameTypeInfo(nsIAtom* aFrameType, DR_FrameTypeInfo::DR_FrameTypeInfo(nsIAtom* aFrameType,

7
layout/printing/nsPrintData.h
View File

@@ -34,9 +34,12 @@
* the terms of any one of the MPL, the GPL or the LGPL. * the terms of any one of the MPL, the GPL or the LGPL.
* *
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
#ifndef nsPrintData_h___ #ifndef nsPrintData_h___
#define nsPrintData_h___ #define nsPrintData_h___
#include "mozilla/Attributes.h"
// Interfaces // Interfaces
#include "nsIDOMWindow.h" #include "nsIDOMWindow.h"
#include "nsDeviceContext.h" #include "nsDeviceContext.h"
@@ -123,8 +126,8 @@ public:
PRUnichar* mBrandName; // needed as a substitute name for a document PRUnichar* mBrandName; // needed as a substitute name for a document
private: private:
nsPrintData(); //not implemented nsPrintData() MOZ_DELETE;
nsPrintData& operator=(const nsPrintData& aOther); // not implemented nsPrintData& operator=(const nsPrintData& aOther) MOZ_DELETE;
}; };

5
layout/printing/nsPrintEngine.h
View File

@@ -37,6 +37,8 @@
#ifndef nsPrintEngine_h___ #ifndef nsPrintEngine_h___
#define nsPrintEngine_h___ #define nsPrintEngine_h___
#include "mozilla/Attributes.h"
#include "nsCOMPtr.h" #include "nsCOMPtr.h"
#include "nsPrintObject.h" #include "nsPrintObject.h"
@@ -298,8 +300,7 @@ protected:
FILE* mDebugFile; FILE* mDebugFile;
private: private:
nsPrintEngine& operator=(const nsPrintEngine& aOther); // not implemented nsPrintEngine& operator=(const nsPrintEngine& aOther) MOZ_DELETE;
}; };
#endif /* nsPrintEngine_h___ */ #endif /* nsPrintEngine_h___ */

5
layout/printing/nsPrintObject.h
View File

@@ -37,6 +37,8 @@
#ifndef nsPrintObject_h___ #ifndef nsPrintObject_h___
#define nsPrintObject_h___ #define nsPrintObject_h___
#include "mozilla/Attributes.h"
// Interfaces // Interfaces
#include "nsCOMPtr.h" #include "nsCOMPtr.h"
#include "nsIContent.h" #include "nsIContent.h"
@@ -94,8 +96,7 @@ public:
float mZoomRatio; float mZoomRatio;
private: private:
nsPrintObject& operator=(const nsPrintObject& aOther); // not implemented nsPrintObject& operator=(const nsPrintObject& aOther) MOZ_DELETE;
}; };

7
layout/style/Declaration.h
View File

@@ -44,6 +44,8 @@
#ifndef mozilla_css_Declaration_h #ifndef mozilla_css_Declaration_h
#define mozilla_css_Declaration_h #define mozilla_css_Declaration_h
#include "mozilla/Attributes.h"
// This header is in EXPORTS because it's used in several places in content/, // This header is in EXPORTS because it's used in several places in content/,
// but it's not really a public interface. // but it's not really a public interface.
#ifndef _IMPL_NS_LAYOUT #ifndef _IMPL_NS_LAYOUT
@@ -239,9 +241,8 @@ public:
#endif #endif
private: private:
// Not implemented, and not supported. Declaration& operator=(const Declaration& aCopy) MOZ_DELETE;
Declaration& operator=(const Declaration& aCopy); bool operator==(const Declaration& aCopy) const MOZ_DELETE;
bool operator==(const Declaration& aCopy) const;
static void AppendImportanceToString(bool aIsImportant, nsAString& aString); static void AppendImportanceToString(bool aIsImportant, nsAString& aString);
// return whether there was a value in |aValue| (i.e., it had a non-null unit) // return whether there was a value in |aValue| (i.e., it had a non-null unit)

35
layout/style/StyleRule.h
View File

@@ -45,6 +45,8 @@
#ifndef mozilla_css_StyleRule_h__ #ifndef mozilla_css_StyleRule_h__
#define mozilla_css_StyleRule_h__ #define mozilla_css_StyleRule_h__
#include "mozilla/Attributes.h"
//#include <stdio.h> //#include <stdio.h>
#include "mozilla/css/Rule.h" #include "mozilla/css/Rule.h"
#include "nsString.h" #include "nsString.h"
@@ -72,9 +74,8 @@ public:
private: private:
nsAtomList* Clone(bool aDeep) const; nsAtomList* Clone(bool aDeep) const;
// These are not supported and are not implemented! nsAtomList(const nsAtomList& aCopy) MOZ_DELETE;
nsAtomList(const nsAtomList& aCopy); nsAtomList& operator=(const nsAtomList& aCopy) MOZ_DELETE;
nsAtomList& operator=(const nsAtomList& aCopy);
}; };
struct nsPseudoClassList { struct nsPseudoClassList {
@@ -109,9 +110,8 @@ public:
private: private:
nsPseudoClassList* Clone(bool aDeep) const; nsPseudoClassList* Clone(bool aDeep) const;
// These are not supported and are not implemented! nsPseudoClassList(const nsPseudoClassList& aCopy) MOZ_DELETE;
nsPseudoClassList(const nsPseudoClassList& aCopy); nsPseudoClassList& operator=(const nsPseudoClassList& aCopy) MOZ_DELETE;
nsPseudoClassList& operator=(const nsPseudoClassList& aCopy);
}; };
#define NS_ATTR_FUNC_SET 0 // [attr] #define NS_ATTR_FUNC_SET 0 // [attr]
@@ -146,9 +146,8 @@ public:
private: private:
nsAttrSelector* Clone(bool aDeep) const; nsAttrSelector* Clone(bool aDeep) const;
// These are not supported and are not implemented! nsAttrSelector(const nsAttrSelector& aCopy) MOZ_DELETE;
nsAttrSelector(const nsAttrSelector& aCopy); nsAttrSelector& operator=(const nsAttrSelector& aCopy) MOZ_DELETE;
nsAttrSelector& operator=(const nsAttrSelector& aCopy);
}; };
struct nsCSSSelector { struct nsCSSSelector {
@@ -235,9 +234,9 @@ public:
private: private:
// PRInt16 to make sure it packs well with mOperator // PRInt16 to make sure it packs well with mOperator
PRInt16 mPseudoType; PRInt16 mPseudoType;
// These are not supported and are not implemented!
nsCSSSelector(const nsCSSSelector& aCopy); nsCSSSelector(const nsCSSSelector& aCopy) MOZ_DELETE;
nsCSSSelector& operator=(const nsCSSSelector& aCopy); nsCSSSelector& operator=(const nsCSSSelector& aCopy) MOZ_DELETE;
}; };
/** /**
@@ -277,9 +276,8 @@ struct nsCSSSelectorList {
private: private:
nsCSSSelectorList* Clone(bool aDeep) const; nsCSSSelectorList* Clone(bool aDeep) const;
// These are not supported and are not implemented! nsCSSSelectorList(const nsCSSSelectorList& aCopy) MOZ_DELETE;
nsCSSSelectorList(const nsCSSSelectorList& aCopy); nsCSSSelectorList& operator=(const nsCSSSelectorList& aCopy) MOZ_DELETE;
nsCSSSelectorList& operator=(const nsCSSSelectorList& aCopy);
}; };
// 464bab7a-2fce-4f30-ab44-b7a5f3aae57d // 464bab7a-2fce-4f30-ab44-b7a5f3aae57d
@@ -381,10 +379,6 @@ public:
virtual void List(FILE* out = stdout, PRInt32 aIndent = 0) const; virtual void List(FILE* out = stdout, PRInt32 aIndent = 0) const;
#endif #endif
private:
// This is not supported and not implemented!
StyleRule& operator=(const StyleRule& aCopy);
private: private:
~StyleRule(); ~StyleRule();
@@ -396,6 +390,9 @@ private:
// Keep the same type so that MSVC packs them. // Keep the same type so that MSVC packs them.
PRUint32 mLineNumber : 31; PRUint32 mLineNumber : 31;
PRUint32 mWasMatched : 1; PRUint32 mWasMatched : 1;
private:
StyleRule& operator=(const StyleRule& aCopy) MOZ_DELETE;
}; };
} // namespace css } // namespace css

7
layout/style/nsCSSParser.h
View File

@@ -40,6 +40,8 @@
#ifndef nsCSSParser_h___ #ifndef nsCSSParser_h___
#define nsCSSParser_h___ #define nsCSSParser_h___
#include "mozilla/Attributes.h"
#include "nsAString.h" #include "nsAString.h"
#include "nsCSSProperty.h" #include "nsCSSProperty.h"
#include "nsColor.h" #include "nsColor.h"
@@ -74,9 +76,8 @@ public:
static void Shutdown(); static void Shutdown();
private: private:
// not to be implemented nsCSSParser(nsCSSParser const&) MOZ_DELETE;
nsCSSParser(nsCSSParser const&); nsCSSParser& operator=(nsCSSParser const&) MOZ_DELETE;
nsCSSParser& operator=(nsCSSParser const&);
public: public:
// Set a style sheet for the parser to fill in. The style sheet must // Set a style sheet for the parser to fill in. The style sheet must

17
layout/style/nsCSSValue.h
View File

@@ -40,6 +40,8 @@
#ifndef nsCSSValue_h___ #ifndef nsCSSValue_h___
#define nsCSSValue_h___ #define nsCSSValue_h___
#include "mozilla/Attributes.h"
#include "nsCOMPtr.h" #include "nsCOMPtr.h"
#include "nsCRTGlue.h" #include "nsCRTGlue.h"
#include "nsCSSKeywords.h" #include "nsCSSKeywords.h"
@@ -495,9 +497,8 @@ public:
private: private:
mutable bool mURIResolved; mutable bool mURIResolved;
// not to be implemented URL(const URL& aOther) MOZ_DELETE;
URL(const URL& aOther); URL& operator=(const URL& aOther) MOZ_DELETE;
URL& operator=(const URL& aOther);
}; };
struct Image : public URL { struct Image : public URL {
@@ -644,9 +645,8 @@ private:
#undef CSSVALUE_LIST_FOR_EXTRA_VALUES #undef CSSVALUE_LIST_FOR_EXTRA_VALUES
private: private:
// not to be implemented Array(const Array& aOther) MOZ_DELETE;
Array(const Array& aOther); Array& operator=(const Array& aOther) MOZ_DELETE;
Array& operator=(const Array& aOther);
}; };
// Prefer nsCSSValue::Array for lists of fixed size. // Prefer nsCSSValue::Array for lists of fixed size.
@@ -1073,9 +1073,8 @@ struct nsCSSValueGradient {
NS_INLINE_DECL_REFCOUNTING(nsCSSValueGradient) NS_INLINE_DECL_REFCOUNTING(nsCSSValueGradient)
private: private:
// not to be implemented nsCSSValueGradient(const nsCSSValueGradient& aOther) MOZ_DELETE;
nsCSSValueGradient(const nsCSSValueGradient& aOther); nsCSSValueGradient& operator=(const nsCSSValueGradient& aOther) MOZ_DELETE;
nsCSSValueGradient& operator=(const nsCSSValueGradient& aOther);
}; };
struct nsCSSCornerSizes { struct nsCSSCornerSizes {

7
layout/style/nsHTMLCSSStyleSheet.h
View File

@@ -42,6 +42,8 @@
#ifndef nsHTMLCSSStyleSheet_h_ #ifndef nsHTMLCSSStyleSheet_h_
#define nsHTMLCSSStyleSheet_h_ #define nsHTMLCSSStyleSheet_h_
#include "mozilla/Attributes.h"
#include "nsIStyleSheet.h" #include "nsIStyleSheet.h"
#include "nsIStyleRuleProcessor.h" #include "nsIStyleRuleProcessor.h"
@@ -90,9 +92,8 @@ public:
SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const MOZ_OVERRIDE; SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const MOZ_OVERRIDE;
private: private:
// These are not supported and are not implemented! nsHTMLCSSStyleSheet(const nsHTMLCSSStyleSheet& aCopy) MOZ_DELETE;
nsHTMLCSSStyleSheet(const nsHTMLCSSStyleSheet& aCopy); nsHTMLCSSStyleSheet& operator=(const nsHTMLCSSStyleSheet& aCopy) MOZ_DELETE;
nsHTMLCSSStyleSheet& operator=(const nsHTMLCSSStyleSheet& aCopy);
protected: protected:
nsCOMPtr<nsIURI> mURL; nsCOMPtr<nsIURI> mURL;

7
layout/style/nsHTMLStyleSheet.h
View File

@@ -45,6 +45,8 @@
#ifndef nsHTMLStyleSheet_h_ #ifndef nsHTMLStyleSheet_h_
#define nsHTMLStyleSheet_h_ #define nsHTMLStyleSheet_h_
#include "mozilla/Attributes.h"
#include "nsIStyleSheet.h" #include "nsIStyleSheet.h"
#include "nsIStyleRuleProcessor.h" #include "nsIStyleRuleProcessor.h"
#include "nsIStyleRule.h" #include "nsIStyleRule.h"
@@ -107,9 +109,8 @@ public:
PRInt64 DOMSizeOf() const; PRInt64 DOMSizeOf() const;
private: private:
// These are not supported and are not implemented! nsHTMLStyleSheet(const nsHTMLStyleSheet& aCopy) MOZ_DELETE;
nsHTMLStyleSheet(const nsHTMLStyleSheet& aCopy); nsHTMLStyleSheet& operator=(const nsHTMLStyleSheet& aCopy) MOZ_DELETE;
nsHTMLStyleSheet& operator=(const nsHTMLStyleSheet& aCopy);
~nsHTMLStyleSheet(); ~nsHTMLStyleSheet();

7
layout/style/nsStyleSet.h
View File

@@ -47,6 +47,8 @@
#ifndef nsStyleSet_h_ #ifndef nsStyleSet_h_
#define nsStyleSet_h_ #define nsStyleSet_h_
#include "mozilla/Attributes.h"
#include "nsIStyleRuleProcessor.h" #include "nsIStyleRuleProcessor.h"
#include "nsCSSStyleSheet.h" #include "nsCSSStyleSheet.h"
#include "nsBindingManager.h" #include "nsBindingManager.h"
@@ -321,9 +323,8 @@ class nsStyleSet
nsIStyleRule* InitialStyleRule(); nsIStyleRule* InitialStyleRule();
private: private:
// Not to be implemented nsStyleSet(const nsStyleSet& aCopy) MOZ_DELETE;
nsStyleSet(const nsStyleSet& aCopy); nsStyleSet& operator=(const nsStyleSet& aCopy) MOZ_DELETE;
nsStyleSet& operator=(const nsStyleSet& aCopy);
// Returns false on out-of-memory. // Returns false on out-of-memory.
bool BuildDefaultStyleData(nsPresContext* aPresContext); bool BuildDefaultStyleData(nsPresContext* aPresContext);

11
layout/style/nsStyleStruct.h
View File

@@ -48,6 +48,8 @@
#ifndef nsStyleStruct_h___ #ifndef nsStyleStruct_h___
#define nsStyleStruct_h___ #define nsStyleStruct_h___
#include "mozilla/Attributes.h"
#include "nsColor.h" #include "nsColor.h"
#include "nsCoord.h" #include "nsCoord.h"
#include "nsMargin.h" #include "nsMargin.h"
@@ -179,9 +181,8 @@ public:
private: private:
~nsStyleGradient() {} ~nsStyleGradient() {}
// Not to be implemented nsStyleGradient(const nsStyleGradient& aOther) MOZ_DELETE;
nsStyleGradient(const nsStyleGradient& aOther); nsStyleGradient& operator=(const nsStyleGradient& aOther) MOZ_DELETE;
nsStyleGradient& operator=(const nsStyleGradient& aOther);
}; };
enum nsStyleImageType { enum nsStyleImageType {
@@ -938,7 +939,7 @@ private:
nscoord mTwipsPerPixel; nscoord mTwipsPerPixel;
nsStyleBorder& operator=(const nsStyleBorder& aOther); // Not to be implemented nsStyleBorder& operator=(const nsStyleBorder& aOther) MOZ_DELETE;
}; };
@@ -1064,7 +1065,7 @@ struct nsStyleList {
PRUint8 mListStylePosition; // [inherited] PRUint8 mListStylePosition; // [inherited]
private: private:
nsCOMPtr<imgIRequest> mListStyleImage; // [inherited] nsCOMPtr<imgIRequest> mListStyleImage; // [inherited]
nsStyleList& operator=(const nsStyleList& aOther); // Not to be implemented nsStyleList& operator=(const nsStyleList& aOther) MOZ_DELETE;
public: public:
nsRect mImageRegion; // [inherited] the rect to use within an image nsRect mImageRegion; // [inherited] the rect to use within an image
}; };

16
modules/libjar/nsZipArchive.h
View File

@@ -43,6 +43,8 @@
#ifndef nsZipArchive_h_ #ifndef nsZipArchive_h_
#define nsZipArchive_h_ #define nsZipArchive_h_
#include "mozilla/Attributes.h"
#define ZIP_TABSIZE 256 #define ZIP_TABSIZE 256
#define ZIP_BUFLEN (4*1024) /* Used as output buffer when deflating items to a file */ #define ZIP_BUFLEN (4*1024) /* Used as output buffer when deflating items to a file */
@@ -250,14 +252,15 @@ private:
// logging handle // logging handle
mozilla::AutoFDClose mLog; mozilla::AutoFDClose mLog;
//--- private methods ---
nsZipArchive& operator=(const nsZipArchive& rhs); // prevent assignments
nsZipArchive(const nsZipArchive& rhs); // prevent copies
private:
//--- private methods ---
nsZipItem* CreateZipItem(); nsZipItem* CreateZipItem();
nsresult BuildFileList(); nsresult BuildFileList();
nsresult BuildSynthetics(); nsresult BuildSynthetics();
nsZipArchive& operator=(const nsZipArchive& rhs) MOZ_DELETE;
nsZipArchive(const nsZipArchive& rhs) MOZ_DELETE;
}; };
/** /**
@@ -280,9 +283,8 @@ private:
PRUint16 mSlot; PRUint16 mSlot;
bool mRegExp; bool mRegExp;
//-- prevent copies and assignments nsZipFind& operator=(const nsZipFind& rhs) MOZ_DELETE;
nsZipFind& operator=(const nsZipFind& rhs); nsZipFind(const nsZipFind& rhs) MOZ_DELETE;
nsZipFind(const nsZipFind& rhs);
}; };
/** /**

15
security/manager/ssl/src/nsRecentBadCerts.h
View File

@@ -40,7 +40,9 @@
#ifndef __RECENTBADCERTS_H__ #ifndef __RECENTBADCERTS_H__
#define __RECENTBADCERTS_H__ #define __RECENTBADCERTS_H__
#include "mozilla/Attributes.h"
#include "mozilla/ReentrantMonitor.h" #include "mozilla/ReentrantMonitor.h"
#include "nsIRecentBadCertsService.h" #include "nsIRecentBadCertsService.h"
#include "nsTHashtable.h" #include "nsTHashtable.h"
#include "nsString.h" #include "nsString.h"
@@ -80,17 +82,8 @@ public:
bool isUntrusted; bool isUntrusted;
private: private:
RecentBadCert(const RecentBadCert &other) RecentBadCert(const RecentBadCert &other) MOZ_DELETE;
{ RecentBadCert &operator=(const RecentBadCert &other) MOZ_DELETE;
NS_NOTREACHED("RecentBadCert(const RecentBadCert &other) not implemented");
this->operator=(other);
}
RecentBadCert &operator=(const RecentBadCert &other)
{
NS_NOTREACHED("RecentBadCert &operator=(const RecentBadCert &other) not implemented");
return *this;
}
}; };
class nsRecentBadCertsService : public nsIRecentBadCertsService class nsRecentBadCertsService : public nsIRecentBadCertsService

4
xpcom/base/nsAutoRef.h
View File

@@ -40,6 +40,8 @@
#ifndef nsAutoRef_h_ #ifndef nsAutoRef_h_
#define nsAutoRef_h_ #define nsAutoRef_h_
#include "mozilla/Attributes.h"
#include "nscore.h" // for nsnull, bool #include "nscore.h" // for nsnull, bool
template <class T> class nsSimpleRef; template <class T> class nsSimpleRef;
@@ -642,7 +644,7 @@ protected:
}; };
private: private:
ThisClass& operator=(const ThisClass& aSmartRef); ThisClass& operator=(const ThisClass& aSmartRef) MOZ_DELETE;
public: public:
RawRef operator->() const RawRef operator->() const

7
xpcom/glue/DeadlockDetector.h
View File

@@ -39,6 +39,8 @@
#ifndef mozilla_DeadlockDetector_h #ifndef mozilla_DeadlockDetector_h
#define mozilla_DeadlockDetector_h #define mozilla_DeadlockDetector_h
#include "mozilla/Attributes.h"
#include <stdlib.h> #include <stdlib.h>
#include "plhash.h" #include "plhash.h"
@@ -566,8 +568,9 @@ public:
*/ */
PRLock* mLock; PRLock* mLock;
DeadlockDetector(const DeadlockDetector& aDD); private:
DeadlockDetector& operator=(const DeadlockDetector& aDD); DeadlockDetector(const DeadlockDetector& aDD) MOZ_DELETE;
DeadlockDetector& operator=(const DeadlockDetector& aDD) MOZ_DELETE;
}; };

6
xpcom/glue/nsCOMArray.h
View File

@@ -39,6 +39,8 @@
#ifndef nsCOMArray_h__ #ifndef nsCOMArray_h__
#define nsCOMArray_h__ #define nsCOMArray_h__
#include "mozilla/Attributes.h"
#include "nsVoidArray.h" #include "nsVoidArray.h"
#include "nsISupports.h" #include "nsISupports.h"
@@ -125,7 +127,7 @@ private:
nsVoidArray mArray; nsVoidArray mArray;
// don't implement these, defaults will muck with refcounts! // don't implement these, defaults will muck with refcounts!
nsCOMArray_base& operator=(const nsCOMArray_base& other); nsCOMArray_base& operator=(const nsCOMArray_base& other) MOZ_DELETE;
}; };
// a non-XPCOM, refcounting array of XPCOM objects // a non-XPCOM, refcounting array of XPCOM objects
@@ -277,7 +279,7 @@ class nsCOMArray : public nsCOMArray_base
private: private:
// don't implement these! // don't implement these!
nsCOMArray<T>& operator=(const nsCOMArray<T>& other); nsCOMArray<T>& operator=(const nsCOMArray<T>& other) MOZ_DELETE;
}; };

18
xpcom/glue/nsStringAPI.h
View File

@@ -50,6 +50,8 @@
#ifndef nsStringAPI_h__ #ifndef nsStringAPI_h__
#define nsStringAPI_h__ #define nsStringAPI_h__
#include "mozilla/Attributes.h"
#include "nsXPCOMStrings.h" #include "nsXPCOMStrings.h"
#include "nsISupportsImpl.h" #include "nsISupportsImpl.h"
#include "prlog.h" #include "prlog.h"
@@ -941,7 +943,7 @@ public:
} }
private: private:
self_type& operator=(const self_type& aString); // NOT IMPLEMENTED self_type& operator=(const self_type& aString) MOZ_DELETE;
}; };
class nsDependentCString : public nsCString class nsDependentCString : public nsCString
@@ -964,7 +966,7 @@ public:
} }
private: private:
self_type& operator=(const self_type& aString); // NOT IMPLEMENTED self_type& operator=(const self_type& aString) MOZ_DELETE;
}; };
@@ -1018,7 +1020,7 @@ public:
} }
private: private:
self_type& operator=(const self_type& aString); // NOT IMPLEMENTED self_type& operator=(const self_type& aString) MOZ_DELETE;
}; };
class NS_ConvertUTF8toUTF16 : public nsString class NS_ConvertUTF8toUTF16 : public nsString
@@ -1040,7 +1042,7 @@ public:
} }
private: private:
self_type& operator=(const self_type& aString); // NOT IMPLEMENTED self_type& operator=(const self_type& aString) MOZ_DELETE;
}; };
class NS_ConvertUTF16toUTF8 : public nsCString class NS_ConvertUTF16toUTF8 : public nsCString
@@ -1062,7 +1064,7 @@ public:
} }
private: private:
self_type& operator=(const self_type& aString); // NOT IMPLEMENTED self_type& operator=(const self_type& aString) MOZ_DELETE;
}; };
class NS_LossyConvertUTF16toASCII : public nsCString class NS_LossyConvertUTF16toASCII : public nsCString
@@ -1084,7 +1086,7 @@ public:
} }
private: private:
self_type& operator=(const self_type& aString); // NOT IMPLEMENTED self_type& operator=(const self_type& aString) MOZ_DELETE;
}; };
@@ -1256,7 +1258,7 @@ public:
} }
private: private:
self_type& operator=(const self_type& aString); // NOT IMPLEMENTED self_type& operator=(const self_type& aString) MOZ_DELETE;
}; };
class NS_COM_GLUE nsDependentCSubstring : public nsCStringContainer class NS_COM_GLUE nsDependentCSubstring : public nsCStringContainer
@@ -1296,7 +1298,7 @@ public:
} }
private: private:
self_type& operator=(const self_type& aString); // NOT IMPLEMENTED self_type& operator=(const self_type& aString) MOZ_DELETE;
}; };

1
xpcom/string/public/nsString.h
View File

@@ -39,6 +39,7 @@
#ifndef nsString_h___ #ifndef nsString_h___
#define nsString_h___ #define nsString_h___
#include "mozilla/Attributes.h"
#ifndef nsSubstring_h___ #ifndef nsSubstring_h___
#include "nsSubstring.h" #include "nsSubstring.h"

5
xpcom/string/public/nsTString.h
View File

@@ -697,8 +697,7 @@ class nsTAdoptingString_CharT : public nsTXPIDLString_CharT
self_type& operator=( const self_type& str ); self_type& operator=( const self_type& str );
private: private:
// NOT TO BE IMPLEMENTED. self_type& operator=( const char_type* data ) MOZ_DELETE;
self_type& operator=( const char_type* data ); self_type& operator=( char_type* data ) MOZ_DELETE;
self_type& operator=( char_type* data );
}; };