Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-11 16:32:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

g++ basic_string annoyances

Browse Source
This commit is contained in:
beard%netscape.com 2000-05-09 03:55:43 +00:00
parent 7f3d0eee51
commit e0725293d9
2 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
js/js2/jstypes.h
View File

@ -251,12 +251,11 @@ namespace JSTypes {
ICodeModule* getICode() { return mICode; }
};
typedef JSValue * (*NativeFunction)(const JSValues& argv);
class JSNativeFunction : public JSFunction {
public:
NativeFunction mCode;
JSNativeFunction(NativeFunction code) : mCode(code) {}
typedef JSValue (*JSCode)(const JSValues& argv);
JSCode mCode;
JSNativeFunction(JSCode code) : mCode(code) {}
virtual bool isNative() { return true; }
};
@ -266,10 +265,19 @@ namespace JSTypes {
JSValue value;
};
#if defined(XP_UNIX)
// bastring.cc defines a funky operator new that assumes a byte-allocator.
typedef string_char_traits<char16> JSCharTraits;
typedef gc_allocator<_Char> JSStringAllocator;
#else
typedef std::char_traits<char16> JSCharTraits;
typedef gc_allocator<char16> JSStringAllocator;
#endif
/**
* Garbage collectable UNICODE string.
*/
class JSString : public std::basic_string<char16, std::char_traits<char16>, gc_allocator<char16> >, public gc_base {
class JSString : public std::basic_string<char16, JSCharTraits, JSStringAllocator>, public gc_base {
public:
JSString() {}
explicit JSString(const String* str);
@ -327,7 +335,7 @@ namespace JSTypes {
return defineVariable(name, value);
}
JSValue& defineNativeFunction(const String& name, NativeFunction code)
JSValue& defineNativeFunction(const String& name, JSNativeFunction::JSCode code)
{
JSValue value(new JSNativeFunction(code));
return defineVariable(name, value);

20
js2/src/jstypes.h
View File

@ -251,12 +251,11 @@ namespace JSTypes {
ICodeModule* getICode() { return mICode; }
};
typedef JSValue * (*NativeFunction)(const JSValues& argv);
class JSNativeFunction : public JSFunction {
public:
NativeFunction mCode;
JSNativeFunction(NativeFunction code) : mCode(code) {}
typedef JSValue (*JSCode)(const JSValues& argv);
JSCode mCode;
JSNativeFunction(JSCode code) : mCode(code) {}
virtual bool isNative() { return true; }
};
@ -266,10 +265,19 @@ namespace JSTypes {
JSValue value;
};
#if defined(XP_UNIX)
// bastring.cc defines a funky operator new that assumes a byte-allocator.
typedef string_char_traits<char16> JSCharTraits;
typedef gc_allocator<_Char> JSStringAllocator;
#else
typedef std::char_traits<char16> JSCharTraits;
typedef gc_allocator<char16> JSStringAllocator;
#endif
/**
* Garbage collectable UNICODE string.
*/
class JSString : public std::basic_string<char16, std::char_traits<char16>, gc_allocator<char16> >, public gc_base {
class JSString : public std::basic_string<char16, JSCharTraits, JSStringAllocator>, public gc_base {
public:
JSString() {}
explicit JSString(const String* str);
@ -327,7 +335,7 @@ namespace JSTypes {
return defineVariable(name, value);
}
JSValue& defineNativeFunction(const String& name, NativeFunction code)
JSValue& defineNativeFunction(const String& name, JSNativeFunction::JSCode code)
{
JSValue value(new JSNativeFunction(code));
return defineVariable(name, value);