From f8fe1e1007cb175abd3420aa042fb04ba18263c5 Mon Sep 17 00:00:00 2001 From: "peterl%netscape.com" Date: Fri, 2 Apr 1999 19:57:07 +0000 Subject: [PATCH] backing out prevoius changes (unix didn't like it) git-svn-id: svn://10.0.0.236/trunk@26060 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/html/style/src/nsHTMLStyleSheet.cpp | 12 ++++-------- mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp | 12 ++++-------- mozilla/layout/style/nsHTMLStyleSheet.cpp | 12 ++++-------- 3 files changed, 12 insertions(+), 24 deletions(-) diff --git a/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp b/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp index d6e7b7ae57b..4e0c42ec5a1 100644 --- a/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp +++ b/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp @@ -147,13 +147,8 @@ private: public: nsMapAttributesFunc mMapFunc; nsIHTMLAttributes* mAttributes; - union { - struct { - PRUint32 mHashSet: 1; - PRUint32 mHashCode: 31; - }; - PRUint32 mBitfiledInitializer; // this is a hack to allow initialization without pruify complaining about a UMR - }; + PRUint32 mHashSet: 1; + PRUint32 mHashCode: 31; }; AttributeKey::AttributeKey(nsMapAttributesFunc aMapFunc, nsIHTMLAttributes* aAttributes) @@ -161,7 +156,8 @@ AttributeKey::AttributeKey(nsMapAttributesFunc aMapFunc, nsIHTMLAttributes* aAtt mAttributes(aAttributes) { NS_ADDREF(mAttributes); - mBitfiledInitializer = 0; + mHashSet = 0; + mHashCode = 0; } AttributeKey::~AttributeKey(void) diff --git a/mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp b/mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp index d6e7b7ae57b..4e0c42ec5a1 100644 --- a/mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp +++ b/mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp @@ -147,13 +147,8 @@ private: public: nsMapAttributesFunc mMapFunc; nsIHTMLAttributes* mAttributes; - union { - struct { - PRUint32 mHashSet: 1; - PRUint32 mHashCode: 31; - }; - PRUint32 mBitfiledInitializer; // this is a hack to allow initialization without pruify complaining about a UMR - }; + PRUint32 mHashSet: 1; + PRUint32 mHashCode: 31; }; AttributeKey::AttributeKey(nsMapAttributesFunc aMapFunc, nsIHTMLAttributes* aAttributes) @@ -161,7 +156,8 @@ AttributeKey::AttributeKey(nsMapAttributesFunc aMapFunc, nsIHTMLAttributes* aAtt mAttributes(aAttributes) { NS_ADDREF(mAttributes); - mBitfiledInitializer = 0; + mHashSet = 0; + mHashCode = 0; } AttributeKey::~AttributeKey(void) diff --git a/mozilla/layout/style/nsHTMLStyleSheet.cpp b/mozilla/layout/style/nsHTMLStyleSheet.cpp index d6e7b7ae57b..4e0c42ec5a1 100644 --- a/mozilla/layout/style/nsHTMLStyleSheet.cpp +++ b/mozilla/layout/style/nsHTMLStyleSheet.cpp @@ -147,13 +147,8 @@ private: public: nsMapAttributesFunc mMapFunc; nsIHTMLAttributes* mAttributes; - union { - struct { - PRUint32 mHashSet: 1; - PRUint32 mHashCode: 31; - }; - PRUint32 mBitfiledInitializer; // this is a hack to allow initialization without pruify complaining about a UMR - }; + PRUint32 mHashSet: 1; + PRUint32 mHashCode: 31; }; AttributeKey::AttributeKey(nsMapAttributesFunc aMapFunc, nsIHTMLAttributes* aAttributes) @@ -161,7 +156,8 @@ AttributeKey::AttributeKey(nsMapAttributesFunc aMapFunc, nsIHTMLAttributes* aAtt mAttributes(aAttributes) { NS_ADDREF(mAttributes); - mBitfiledInitializer = 0; + mHashSet = 0; + mHashCode = 0; } AttributeKey::~AttributeKey(void)