Correct fix for OS/2 bustage (and make it apply to all platforms), since the OS/2 compiler is correct according to C++ 11.8, clause 1, which says "The members of a nested class have no special access to members of an enclosing class...". b=83774

This commit is contained in:
dbaron%dbaron.org 2003-03-19 15:37:58 +00:00
parent c5487624e7
commit 0f14af74c1
2 changed files with 4 additions and 14 deletions

View File

@ -267,16 +267,12 @@ private:
PRBool HandleIconLoads(imgIRequest* aRequest, PRBool aCompleted);
void InvalidateIcon(nsIPresContext *aPresContext);
#ifdef XP_OS2_VACPP
public:
#endif
class IconLoad;
friend class IconLoad; // to allow |IconLoad| to access |SingleIconLoad|.
struct SingleIconLoad {
nsCOMPtr<imgIRequest> mRequest;
};
#ifdef XP_OS2_VACPP
private:
#endif
class IconLoad {
// private class that wraps the data and logic needed for
// broken image and loading image icons
@ -316,7 +312,6 @@ private:
PRPackedBool mPrefShowPlaceholders;
};
static IconLoad* mIconLoad; // singleton pattern: one LoadIcons instance is used
};
#endif /* nsImageFrame_h___ */

View File

@ -267,16 +267,12 @@ private:
PRBool HandleIconLoads(imgIRequest* aRequest, PRBool aCompleted);
void InvalidateIcon(nsIPresContext *aPresContext);
#ifdef XP_OS2_VACPP
public:
#endif
class IconLoad;
friend class IconLoad; // to allow |IconLoad| to access |SingleIconLoad|.
struct SingleIconLoad {
nsCOMPtr<imgIRequest> mRequest;
};
#ifdef XP_OS2_VACPP
private:
#endif
class IconLoad {
// private class that wraps the data and logic needed for
// broken image and loading image icons
@ -316,7 +312,6 @@ private:
PRPackedBool mPrefShowPlaceholders;
};
static IconLoad* mIconLoad; // singleton pattern: one LoadIcons instance is used
};
#endif /* nsImageFrame_h___ */