Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated for GCC

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@61363 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
waldemar%netscape.com
2000-02-19 10:01:53 +00:00
parent 26aee5707d
commit d3187b25b0
2 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/js/js2/utilities.cpp
View File

@@ -32,6 +32,10 @@
#include <Types.h>
#endif
#ifdef XP_UNIX
#include <cstdio>
#endif
namespace JS = JavaScript;
@@ -91,7 +95,7 @@ static void dprintf(const char *format, ...)
void JS::Assert(const char *s, const char *file, int line)
{
#if defined(XP_UNIX) || defined(XP_OS2)
fprintf(stderr, "Assertion failure: %s, at %s:%d\n", s, file, line);
std::fprintf(std::stderr, "Assertion failure: %s, at %s:%d\n", s, file, line);
#endif
#ifdef XP_MAC
dprintf("Assertion failure: %s, at %s:%d\n", s, file, line);
@@ -1535,6 +1539,11 @@ const char16 *JS::skipWhiteSpace(const char16 *str, const char16 *strEnd)
// C++ I/O
//
#ifdef __GNUC__
JS::SaveFormat::SaveFormat(ostream &) {}
JS::SaveFormat::~SaveFormat() {}
#else
JS::SaveFormat::SaveFormat(ostream &out): o(out), flags(out.flags()), fill(out.fill()) {}
JS::SaveFormat::~SaveFormat()
@@ -1542,6 +1551,7 @@ JS::SaveFormat::~SaveFormat()
o.flags(flags);
o.fill(fill);
}
#endif
// Quotes for printing non-ASCII characters on an ASCII stream
@@ -1564,7 +1574,11 @@ void JS::showChar(ostream &out, char16 ch)
out << static_cast<char>(ch);
else {
SaveFormat sf(out);
#ifdef __GNUC__
out << beginUnprintable << std::hex << std::setw(4) << std::setfill('0') << (uint16)ch << endUnprintable;
#else
out << beginUnprintable << std::hex << std::uppercase << std::setw(4) << std::setfill('0') << (uint16)ch << endUnprintable;
#endif
}
}

16
mozilla/js2/src/utilities.cpp
View File

@@ -32,6 +32,10 @@
#include <Types.h>
#endif
#ifdef XP_UNIX
#include <cstdio>
#endif
namespace JS = JavaScript;
@@ -91,7 +95,7 @@ static void dprintf(const char *format, ...)
void JS::Assert(const char *s, const char *file, int line)
{
#if defined(XP_UNIX) || defined(XP_OS2)
fprintf(stderr, "Assertion failure: %s, at %s:%d\n", s, file, line);
std::fprintf(std::stderr, "Assertion failure: %s, at %s:%d\n", s, file, line);
#endif
#ifdef XP_MAC
dprintf("Assertion failure: %s, at %s:%d\n", s, file, line);
@@ -1535,6 +1539,11 @@ const char16 *JS::skipWhiteSpace(const char16 *str, const char16 *strEnd)
// C++ I/O
//
#ifdef __GNUC__
JS::SaveFormat::SaveFormat(ostream &) {}
JS::SaveFormat::~SaveFormat() {}
#else
JS::SaveFormat::SaveFormat(ostream &out): o(out), flags(out.flags()), fill(out.fill()) {}
JS::SaveFormat::~SaveFormat()
@@ -1542,6 +1551,7 @@ JS::SaveFormat::~SaveFormat()
o.flags(flags);
o.fill(fill);
}
#endif
// Quotes for printing non-ASCII characters on an ASCII stream
@@ -1564,7 +1574,11 @@ void JS::showChar(ostream &out, char16 ch)
out << static_cast<char>(ch);
else {
SaveFormat sf(out);
#ifdef __GNUC__
out << beginUnprintable << std::hex << std::setw(4) << std::setfill('0') << (uint16)ch << endUnprintable;
#else
out << beginUnprintable << std::hex << std::uppercase << std::setw(4) << std::setfill('0') << (uint16)ch << endUnprintable;
#endif
}
}