19067 - Recent change to xpcom/io/nsStorageStream broke pre-ANSI C++ compilers

Status: VERIFIED DUPLICATE of bug 19036

(Core :: XPCOM, defect, P3)

Description

[tor]

Recent changes to nsStorageStream use bool instead of PRBool, causing
problems with pre-ANSI C++ compilers.  The fix is trivial:

Index: nsStorageStream.cpp
===================================================================
RCS file: /cvsroot/mozilla/xpcom/io/nsStorageStream.cpp,v
retrieving revision 1.2
diff -u -r1.2 nsStorageStream.cpp
--- nsStorageStream.cpp 1999/11/16 19:14:05     1.2
+++ nsStorageStream.cpp 1999/11/17 18:56:57
@@ -33,7 +33,7 @@
 #include "prbit.h"

 nsStorageStream::nsStorageStream()
-    : mSegmentedBuffer(0), mSegmentSize(0), mWriteInProgress(false),
+    : mSegmentedBuffer(0), mSegmentSize(0), mWriteInProgress(PR_FALSE),
       mWriteCursor(0), mSegmentEnd(0), mLogicalLength(0), mLastSegmentNum(-1)
 {
     NS_INIT_REFCNT();
@@ -104,14 +104,14 @@

     NS_ADDREF(this);
     *aOutputStream = NS_STATIC_CAST(nsIOutputStream*, this);
-    mWriteInProgress = true;
+    mWriteInProgress = PR_TRUE;
     return NS_OK;
 }

 NS_IMETHODIMP
 nsStorageStream::Close()
 {
-    mWriteInProgress = false;
+    mWriteInProgress = PR_FALSE;

     PRInt32 segmentOffset = SegOffset(mLogicalLength);

Index: nsStorageStream.h
===================================================================
RCS file: /cvsroot/mozilla/xpcom/io/nsStorageStream.h,v
retrieving revision 1.2
diff -u -r1.2 nsStorageStream.h
--- nsStorageStream.h   1999/11/16 19:14:08     1.2
+++ nsStorageStream.h   1999/11/17 18:56:57
@@ -56,7 +56,7 @@
     PRUint32           mSegmentSize;       // All segments, except possibly the
last, are of this size
                                            //   Must be power-of-2
     PRUint32           mSegmentSizeLog2;   // log2(mSegmentSize)
-    bool               mWriteInProgress;   // true, if an un-Close'ed output
stream exists
+    PRBool             mWriteInProgress;   // true, if an un-Close'ed output
stream exists
     PRInt32            mLastSegmentNum;    // Last segment # in use, -1
initially
     char*              mWriteCursor;       // Pointer to next byte to be
written
     char*              mSegmentEnd;        // Pointer to one byte after end of
segment

Comment 1

[Scott Furman]

*** This bug has been marked as a duplicate of 19036 ***

Comment 2

[Joseph Elwell]

[bugday] marking verified, read em both and they're the same.

Comment 3

[Pulsebot]

Pushed by ffxbld-merge:
https://hg.mozilla.org/releases/mozilla-beta/rev/544dc2151042
[fenix] Update Android Components version to 75.0.20210412143103. (https://github.com/mozilla-mobile/fenix/pull/19067)