зеркало из https://github.com/mozilla/pjs.git
removed warnings and a build error
This commit is contained in:
rickg%netscape.com
Родитель
5eea057c07
Коммит
06d43c1933
|
|
@ -52,6 +52,11 @@ inline PRUnichar GetCharAt(const char* aString,PRUint32 anIndex) {
|
|||
// The functions are differentiated by shift direction and the underlying charsize.
|
||||
//
|
||||
|
||||
PRInt32 TrimChars2(char* aString,PRUint32 aLength,const char* aSet,PRBool aEliminateLeading,PRBool aEliminateTrailing);
|
||||
PRInt32 CompressChars1(char* aString,PRUint32 aLength,const char* aSet,PRUint32 aChar,PRBool aEliminateLeading,PRBool aEliminateTrailing);
|
||||
PRInt32 CompressChars2(char* aString,PRUint32 aLength,const char* aSet,PRUint32 aChar,PRBool aEliminateLeading,PRBool aEliminateTrailing);
|
||||
|
||||
|
||||
/**
|
||||
* This method shifts single byte characters left by a given amount from an given offset.
|
||||
* @update gess 01/04/99
|
||||
|
|
|
|||
|
|
@ -348,5 +348,8 @@ public:
|
|||
|
||||
};
|
||||
|
||||
char* GetSharedEmptyBuffer();
|
||||
nsIMemoryAgent* GetDefaultAgent(void);
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -1605,6 +1605,10 @@ public:
|
|||
nsDeque mDeque;
|
||||
};
|
||||
|
||||
void Subsume(nsStr& aDest,nsStr& aSource);
|
||||
nsStringRecycler& GetRecycler(void);
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
* @update gess 01/04/99
|
||||
|
|
@ -1695,6 +1699,8 @@ NS_BASE int fputs(const nsString2& aString, FILE* out)
|
|||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
* @update gess 01/04/99
|
||||
|
|
@ -2039,7 +2045,7 @@ nsAutoString2::nsAutoString2(eCharSize aCharSize) : nsString2(aCharSize){
|
|||
*/
|
||||
nsAutoString2::nsAutoString2(nsStr& aStr,const char* aCString) : nsString2((eCharSize)aStr.mMultibyte) {
|
||||
eCharSize theSize=(eCharSize)aStr.mMultibyte;
|
||||
nsStr::Initialize(*this,mBuffer,(sizeof(mBuffer)>>theCharSize)-1,0,theCharSize,PR_FALSE);
|
||||
nsStr::Initialize(*this,mBuffer,(sizeof(mBuffer)>>theSize)-1,0,theSize,PR_FALSE);
|
||||
mAgent=0;
|
||||
AddNullTerminator(*this);
|
||||
Assign(aCString);
|
||||
|
|
|
|||
|
|
@ -348,5 +348,8 @@ public:
|
|||
|
||||
};
|
||||
|
||||
char* GetSharedEmptyBuffer();
|
||||
nsIMemoryAgent* GetDefaultAgent(void);
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -1605,6 +1605,10 @@ public:
|
|||
nsDeque mDeque;
|
||||
};
|
||||
|
||||
void Subsume(nsStr& aDest,nsStr& aSource);
|
||||
nsStringRecycler& GetRecycler(void);
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
* @update gess 01/04/99
|
||||
|
|
@ -1695,6 +1699,8 @@ NS_BASE int fputs(const nsString2& aString, FILE* out)
|
|||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
* @update gess 01/04/99
|
||||
|
|
@ -2039,7 +2045,7 @@ nsAutoString2::nsAutoString2(eCharSize aCharSize) : nsString2(aCharSize){
|
|||
*/
|
||||
nsAutoString2::nsAutoString2(nsStr& aStr,const char* aCString) : nsString2((eCharSize)aStr.mMultibyte) {
|
||||
eCharSize theSize=(eCharSize)aStr.mMultibyte;
|
||||
nsStr::Initialize(*this,mBuffer,(sizeof(mBuffer)>>theCharSize)-1,0,theCharSize,PR_FALSE);
|
||||
nsStr::Initialize(*this,mBuffer,(sizeof(mBuffer)>>theSize)-1,0,theSize,PR_FALSE);
|
||||
mAgent=0;
|
||||
AddNullTerminator(*this);
|
||||
Assign(aCString);
|
||||
|
|
|
|||
|
|
@ -52,6 +52,11 @@ inline PRUnichar GetCharAt(const char* aString,PRUint32 anIndex) {
|
|||
// The functions are differentiated by shift direction and the underlying charsize.
|
||||
//
|
||||
|
||||
PRInt32 TrimChars2(char* aString,PRUint32 aLength,const char* aSet,PRBool aEliminateLeading,PRBool aEliminateTrailing);
|
||||
PRInt32 CompressChars1(char* aString,PRUint32 aLength,const char* aSet,PRUint32 aChar,PRBool aEliminateLeading,PRBool aEliminateTrailing);
|
||||
PRInt32 CompressChars2(char* aString,PRUint32 aLength,const char* aSet,PRUint32 aChar,PRBool aEliminateLeading,PRBool aEliminateTrailing);
|
||||
|
||||
|
||||
/**
|
||||
* This method shifts single byte characters left by a given amount from an given offset.
|
||||
* @update gess 01/04/99
|
||||
|
|
|
|||
|
|
@ -348,5 +348,8 @@ public:
|
|||
|
||||
};
|
||||
|
||||
char* GetSharedEmptyBuffer();
|
||||
nsIMemoryAgent* GetDefaultAgent(void);
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -1605,6 +1605,10 @@ public:
|
|||
nsDeque mDeque;
|
||||
};
|
||||
|
||||
void Subsume(nsStr& aDest,nsStr& aSource);
|
||||
nsStringRecycler& GetRecycler(void);
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
* @update gess 01/04/99
|
||||
|
|
@ -1695,6 +1699,8 @@ NS_BASE int fputs(const nsString2& aString, FILE* out)
|
|||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
* @update gess 01/04/99
|
||||
|
|
@ -2039,7 +2045,7 @@ nsAutoString2::nsAutoString2(eCharSize aCharSize) : nsString2(aCharSize){
|
|||
*/
|
||||
nsAutoString2::nsAutoString2(nsStr& aStr,const char* aCString) : nsString2((eCharSize)aStr.mMultibyte) {
|
||||
eCharSize theSize=(eCharSize)aStr.mMultibyte;
|
||||
nsStr::Initialize(*this,mBuffer,(sizeof(mBuffer)>>theCharSize)-1,0,theCharSize,PR_FALSE);
|
||||
nsStr::Initialize(*this,mBuffer,(sizeof(mBuffer)>>theSize)-1,0,theSize,PR_FALSE);
|
||||
mAgent=0;
|
||||
AddNullTerminator(*this);
|
||||
Assign(aCString);
|
||||
|
|
|
|||
|
|
@ -348,5 +348,8 @@ public:
|
|||
|
||||
};
|
||||
|
||||
char* GetSharedEmptyBuffer();
|
||||
nsIMemoryAgent* GetDefaultAgent(void);
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -1605,6 +1605,10 @@ public:
|
|||
nsDeque mDeque;
|
||||
};
|
||||
|
||||
void Subsume(nsStr& aDest,nsStr& aSource);
|
||||
nsStringRecycler& GetRecycler(void);
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
* @update gess 01/04/99
|
||||
|
|
@ -1695,6 +1699,8 @@ NS_BASE int fputs(const nsString2& aString, FILE* out)
|
|||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
* @update gess 01/04/99
|
||||
|
|
@ -2039,7 +2045,7 @@ nsAutoString2::nsAutoString2(eCharSize aCharSize) : nsString2(aCharSize){
|
|||
*/
|
||||
nsAutoString2::nsAutoString2(nsStr& aStr,const char* aCString) : nsString2((eCharSize)aStr.mMultibyte) {
|
||||
eCharSize theSize=(eCharSize)aStr.mMultibyte;
|
||||
nsStr::Initialize(*this,mBuffer,(sizeof(mBuffer)>>theCharSize)-1,0,theCharSize,PR_FALSE);
|
||||
nsStr::Initialize(*this,mBuffer,(sizeof(mBuffer)>>theSize)-1,0,theSize,PR_FALSE);
|
||||
mAgent=0;
|
||||
AddNullTerminator(*this);
|
||||
Assign(aCString);
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче