diff --git a/mozilla/base/public/nsFileStream.h b/mozilla/base/public/nsFileStream.h index a836dc62763..8544350a281 100644 --- a/mozilla/base/public/nsFileStream.h +++ b/mozilla/base/public/nsFileStream.h @@ -249,6 +249,8 @@ public: nsOutputStream& operator << (unsigned short val); nsOutputStream& operator << (long val); nsOutputStream& operator << (unsigned long val); + nsOutputStream& operator << (int val); + nsOutputStream& operator << (unsigned int val); // Support manipulators nsOutputStream& operator << (nsOutputStream& (*pf)(nsOutputStream&)) @@ -513,6 +515,10 @@ public: { return nsOutputStream::operator << (val); } nsOutputStream& operator << (unsigned long val) { return nsOutputStream::operator << (val); } + nsOutputStream& operator << (int val) + { return nsOutputStream::operator << (val); } + nsOutputStream& operator << (unsigned int val) + { return nsOutputStream::operator << (val); } nsOutputStream& operator << (nsOutputStream& (*pf)(nsOutputStream&)) { return nsOutputStream::operator << (pf); } @@ -545,6 +551,10 @@ public: { return nsOutputStream::operator << (val); } nsOutputStream& operator << (unsigned long val) { return nsOutputStream::operator << (val); } + nsOutputStream& operator << (int val) + { return nsOutputStream::operator << (val); } + nsOutputStream& operator << (unsigned int val) + { return nsOutputStream::operator << (val); } nsOutputStream& operator << (nsOutputStream& (*pf)(nsOutputStream&)) { return nsOutputStream::operator << (pf); } @@ -593,6 +603,10 @@ public: { return nsOutputStream::operator << (val); } nsOutputStream& operator << (unsigned long val) { return nsOutputStream::operator << (val); } + nsOutputStream& operator << (int val) + { return nsOutputStream::operator << (val); } + nsOutputStream& operator << (unsigned int val) + { return nsOutputStream::operator << (val); } nsOutputStream& operator << (nsOutputStream& (*pf)(nsOutputStream&)) { return nsOutputStream::operator << (pf); } @@ -633,6 +647,10 @@ public: { return nsOutputStream::operator << (val); } nsOutputStream& operator << (unsigned long val) { return nsOutputStream::operator << (val); } + nsOutputStream& operator << (int val) + { return nsOutputStream::operator << (val); } + nsOutputStream& operator << (unsigned int val) + { return nsOutputStream::operator << (val); } nsOutputStream& operator << (nsOutputStream& (*pf)(nsOutputStream&)) { return nsOutputStream::operator << (pf); } @@ -697,6 +715,10 @@ public: { return nsOutputStream::operator << (val); } nsOutputStream& operator << (unsigned long val) { return nsOutputStream::operator << (val); } + nsOutputStream& operator << (int val) + { return nsOutputStream::operator << (val); } + nsOutputStream& operator << (unsigned int val) + { return nsOutputStream::operator << (val); } nsOutputStream& operator << (nsOutputStream& (*pf)(nsOutputStream&)) { return nsOutputStream::operator << (pf); } diff --git a/mozilla/base/src/nsFileStream.cpp b/mozilla/base/src/nsFileStream.cpp index b24e1c5d348..b0d32f7b6b8 100644 --- a/mozilla/base/src/nsFileStream.cpp +++ b/mozilla/base/src/nsFileStream.cpp @@ -136,7 +136,7 @@ nsOutputStream& nsOutputStream::operator << (short val) //---------------------------------------------------------------------------------------- { char buf[30]; - sprintf(buf, "%d", val); + sprintf(buf, "%hd", val); return (*this << buf); } @@ -145,7 +145,7 @@ nsOutputStream& nsOutputStream::operator << (unsigned short val) //---------------------------------------------------------------------------------------- { char buf[30]; - sprintf(buf, "%ud", val); + sprintf(buf, "%hu", val); return (*this << buf); } @@ -163,7 +163,25 @@ nsOutputStream& nsOutputStream::operator << (unsigned long val) //---------------------------------------------------------------------------------------- { char buf[30]; - sprintf(buf, "%uld", val); + sprintf(buf, "%lu", val); + return (*this << buf); +} + +//---------------------------------------------------------------------------------------- +nsOutputStream& nsOutputStream::operator << (int val) +//---------------------------------------------------------------------------------------- +{ + char buf[30]; + sprintf(buf, "%d", val); + return (*this << buf); +} + +//---------------------------------------------------------------------------------------- +nsOutputStream& nsOutputStream::operator << (unsigned int val) +//---------------------------------------------------------------------------------------- +{ + char buf[30]; + sprintf(buf, "%u", val); return (*this << buf); } diff --git a/mozilla/xpcom/io/nsFileStream.cpp b/mozilla/xpcom/io/nsFileStream.cpp index b24e1c5d348..b0d32f7b6b8 100644 --- a/mozilla/xpcom/io/nsFileStream.cpp +++ b/mozilla/xpcom/io/nsFileStream.cpp @@ -136,7 +136,7 @@ nsOutputStream& nsOutputStream::operator << (short val) //---------------------------------------------------------------------------------------- { char buf[30]; - sprintf(buf, "%d", val); + sprintf(buf, "%hd", val); return (*this << buf); } @@ -145,7 +145,7 @@ nsOutputStream& nsOutputStream::operator << (unsigned short val) //---------------------------------------------------------------------------------------- { char buf[30]; - sprintf(buf, "%ud", val); + sprintf(buf, "%hu", val); return (*this << buf); } @@ -163,7 +163,25 @@ nsOutputStream& nsOutputStream::operator << (unsigned long val) //---------------------------------------------------------------------------------------- { char buf[30]; - sprintf(buf, "%uld", val); + sprintf(buf, "%lu", val); + return (*this << buf); +} + +//---------------------------------------------------------------------------------------- +nsOutputStream& nsOutputStream::operator << (int val) +//---------------------------------------------------------------------------------------- +{ + char buf[30]; + sprintf(buf, "%d", val); + return (*this << buf); +} + +//---------------------------------------------------------------------------------------- +nsOutputStream& nsOutputStream::operator << (unsigned int val) +//---------------------------------------------------------------------------------------- +{ + char buf[30]; + sprintf(buf, "%u", val); return (*this << buf); } diff --git a/mozilla/xpcom/io/nsFileStream.h b/mozilla/xpcom/io/nsFileStream.h index a836dc62763..8544350a281 100644 --- a/mozilla/xpcom/io/nsFileStream.h +++ b/mozilla/xpcom/io/nsFileStream.h @@ -249,6 +249,8 @@ public: nsOutputStream& operator << (unsigned short val); nsOutputStream& operator << (long val); nsOutputStream& operator << (unsigned long val); + nsOutputStream& operator << (int val); + nsOutputStream& operator << (unsigned int val); // Support manipulators nsOutputStream& operator << (nsOutputStream& (*pf)(nsOutputStream&)) @@ -513,6 +515,10 @@ public: { return nsOutputStream::operator << (val); } nsOutputStream& operator << (unsigned long val) { return nsOutputStream::operator << (val); } + nsOutputStream& operator << (int val) + { return nsOutputStream::operator << (val); } + nsOutputStream& operator << (unsigned int val) + { return nsOutputStream::operator << (val); } nsOutputStream& operator << (nsOutputStream& (*pf)(nsOutputStream&)) { return nsOutputStream::operator << (pf); } @@ -545,6 +551,10 @@ public: { return nsOutputStream::operator << (val); } nsOutputStream& operator << (unsigned long val) { return nsOutputStream::operator << (val); } + nsOutputStream& operator << (int val) + { return nsOutputStream::operator << (val); } + nsOutputStream& operator << (unsigned int val) + { return nsOutputStream::operator << (val); } nsOutputStream& operator << (nsOutputStream& (*pf)(nsOutputStream&)) { return nsOutputStream::operator << (pf); } @@ -593,6 +603,10 @@ public: { return nsOutputStream::operator << (val); } nsOutputStream& operator << (unsigned long val) { return nsOutputStream::operator << (val); } + nsOutputStream& operator << (int val) + { return nsOutputStream::operator << (val); } + nsOutputStream& operator << (unsigned int val) + { return nsOutputStream::operator << (val); } nsOutputStream& operator << (nsOutputStream& (*pf)(nsOutputStream&)) { return nsOutputStream::operator << (pf); } @@ -633,6 +647,10 @@ public: { return nsOutputStream::operator << (val); } nsOutputStream& operator << (unsigned long val) { return nsOutputStream::operator << (val); } + nsOutputStream& operator << (int val) + { return nsOutputStream::operator << (val); } + nsOutputStream& operator << (unsigned int val) + { return nsOutputStream::operator << (val); } nsOutputStream& operator << (nsOutputStream& (*pf)(nsOutputStream&)) { return nsOutputStream::operator << (pf); } @@ -697,6 +715,10 @@ public: { return nsOutputStream::operator << (val); } nsOutputStream& operator << (unsigned long val) { return nsOutputStream::operator << (val); } + nsOutputStream& operator << (int val) + { return nsOutputStream::operator << (val); } + nsOutputStream& operator << (unsigned int val) + { return nsOutputStream::operator << (val); } nsOutputStream& operator << (nsOutputStream& (*pf)(nsOutputStream&)) { return nsOutputStream::operator << (pf); }