Worked around Visual C++ bugs

This commit is contained in:
waldemar%netscape.com 2000-04-07 00:47:39 +00:00
parent 5f1d8e929a
commit 5e1e49d9bb
4 changed files with 66 additions and 42 deletions

View File

@ -1833,12 +1833,21 @@ static const uint16 defaultFilterRanges[] = {
JS::BitSet<256> JS::AsciiFileFormatter::defaultFilter(defaultFilterRanges);
// Construct an AsciiFileFormatter using the given file and filter.
// If the filter is nil, use the default filter.
JS::AsciiFileFormatter::AsciiFileFormatter(FILE *file, BitSet<256> *filter):
file(file), filter(filter ? *filter : defaultFilter)
// Construct an AsciiFileFormatter using the given file and filter f.
// If f is nil, use the default filter.
JS::AsciiFileFormatter::AsciiFileFormatter(FILE *file, BitSet<256> *f):
file(file)
#ifndef _WIN32 // Microsoft Visual C++ 6.0 bug
, filter(f ? *f : defaultFilter)
#endif
{
filterEmpty = AsciiFileFormatter::filter.none();
#ifdef _WIN32 // Microsoft Visual C++ 6.0 bug
if (f)
filter = *f;
else
filter = defaultFilter;
#endif
filterEmpty = filter.none();
}

View File

@ -30,23 +30,26 @@
#include <cstdarg>
#ifndef _WIN32 // Microsoft Visual C++ 6.0 bug: standard identifiers should be in std namespace
using std::size_t;
using std::ptrdiff_t;
using std::va_list;
using std::strlen;
using std::strcpy;
using std::FILE;
using std::getc;
using std::fgets;
using std::fputc;
using std::fputs;
using std::sprintf;
using std::snprintf;
using std::vsnprintf;
using std::fprintf;
#define STD std
using std::size_t;
using std::ptrdiff_t;
using std::va_list;
using std::strlen;
using std::strcpy;
using std::FILE;
using std::getc;
using std::fgets;
using std::fputc;
using std::fputs;
using std::sprintf;
using std::snprintf;
using std::vsnprintf;
using std::fprintf;
#define STD std
#else
#define STD
#define STD
// Microsoft Visual C++ 6.0 bug: these identifiers should not begin with underscores
#define snprintf _snprintf
#define vsnprintf _vsnprintf
#endif
using std::string;
using std::auto_ptr;

View File

@ -1833,12 +1833,21 @@ static const uint16 defaultFilterRanges[] = {
JS::BitSet<256> JS::AsciiFileFormatter::defaultFilter(defaultFilterRanges);
// Construct an AsciiFileFormatter using the given file and filter.
// If the filter is nil, use the default filter.
JS::AsciiFileFormatter::AsciiFileFormatter(FILE *file, BitSet<256> *filter):
file(file), filter(filter ? *filter : defaultFilter)
// Construct an AsciiFileFormatter using the given file and filter f.
// If f is nil, use the default filter.
JS::AsciiFileFormatter::AsciiFileFormatter(FILE *file, BitSet<256> *f):
file(file)
#ifndef _WIN32 // Microsoft Visual C++ 6.0 bug
, filter(f ? *f : defaultFilter)
#endif
{
filterEmpty = AsciiFileFormatter::filter.none();
#ifdef _WIN32 // Microsoft Visual C++ 6.0 bug
if (f)
filter = *f;
else
filter = defaultFilter;
#endif
filterEmpty = filter.none();
}

View File

@ -30,23 +30,26 @@
#include <cstdarg>
#ifndef _WIN32 // Microsoft Visual C++ 6.0 bug: standard identifiers should be in std namespace
using std::size_t;
using std::ptrdiff_t;
using std::va_list;
using std::strlen;
using std::strcpy;
using std::FILE;
using std::getc;
using std::fgets;
using std::fputc;
using std::fputs;
using std::sprintf;
using std::snprintf;
using std::vsnprintf;
using std::fprintf;
#define STD std
using std::size_t;
using std::ptrdiff_t;
using std::va_list;
using std::strlen;
using std::strcpy;
using std::FILE;
using std::getc;
using std::fgets;
using std::fputc;
using std::fputs;
using std::sprintf;
using std::snprintf;
using std::vsnprintf;
using std::fprintf;
#define STD std
#else
#define STD
#define STD
// Microsoft Visual C++ 6.0 bug: these identifiers should not begin with underscores
#define snprintf _snprintf
#define vsnprintf _vsnprintf
#endif
using std::string;
using std::auto_ptr;