mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

OS/2 Tinderbox breakage 

Need to make these values really PRUint32 for VisualAge
If you guys thought your changes to get gcc to work were bad, wait until you see these
This commit is contained in:
mkaply%us.ibm.com 2000-09-29 14:36:46 +00:00
Родитель d52574f9e0
Коммит e751ae1955
2 изменённых файлов: 20 добавлений и 10 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

15
content/xul/templates/src/nsXULTemplateBuilder.cpp
Просмотреть файл

@ -4986,7 +4986,8 @@ nsXULTemplateBuilder::ParseAttribute(const nsAReadableString& aAttributeValue,
else if (backup != mark && aTextCallback) {
// Okay, we've found a variable, and there's some vanilla
// text that's been buffered up. Flush it.
(*aTextCallback)(this, Substring(aAttributeValue, mark, backup - mark), aClosure);
(*aTextCallback)(this, Substring(aAttributeValue, NS_STATIC_CAST(PRUint32, mark),
NS_STATIC_CAST(PRUint32, backup - mark)), aClosure);
}
// Construct a substring that is the symbol we need to look up
@ -5012,13 +5013,15 @@ nsXULTemplateBuilder::ParseAttribute(const nsAReadableString& aAttributeValue,
if (c != PRUnichar('^'))
--i;
(*aVariableCallback)(this, Substring(aAttributeValue, first, last - first), aClosure);
(*aVariableCallback)(this, Substring(aAttributeValue, NS_STATIC_CAST(PRUint32, first),
NS_STATIC_CAST(PRUint32, last - first)), aClosure);
mark = i + 1;
}
if (backup != mark && aTextCallback) {
// If there's any text left over, then fire the text callback
(*aTextCallback)(this, Substring(aAttributeValue, mark, backup - mark), aClosure);
(*aTextCallback)(this, Substring(aAttributeValue, NS_STATIC_CAST(PRUint32, mark),
NS_STATIC_CAST(PRUint32, backup - mark)), aClosure);
}
}
@ -7475,7 +7478,8 @@ nsXULTemplateBuilder::AddBindingsFor(nsXULTemplateBuilder* aThis,
{
// We should *only* be recieving "rdf:"-style variables. Make
// sure...
if (Substring(aVariable, 0, 4) != NS_LITERAL_STRING("rdf:"))
if (Substring(aVariable, NS_STATIC_CAST(PRUint32, 0),
NS_STATIC_CAST(PRUint32, 4)) != NS_LITERAL_STRING("rdf:"))
return;
Rule* rule = NS_STATIC_CAST(Rule*, aClosure);
@ -7488,7 +7492,8 @@ nsXULTemplateBuilder::AddBindingsFor(nsXULTemplateBuilder* aThis,
// Strip it down to the raw RDF property by clobbering the "rdf:"
// prefix
const nsAReadableString& propertyStr = Substring(aVariable, 4, aVariable.Length() - 4);
const nsAReadableString& propertyStr = Substring(aVariable, NS_STATIC_CAST(PRUint32, 4),
aVariable.Length() - 4);
nsCOMPtr<nsIRDFResource> property;
gRDFService->GetUnicodeResource(nsPromiseFlatString(propertyStr), getter_AddRefs(property));

15
rdf/content/src/nsXULTemplateBuilder.cpp
Просмотреть файл

@ -4986,7 +4986,8 @@ nsXULTemplateBuilder::ParseAttribute(const nsAReadableString& aAttributeValue,
else if (backup != mark && aTextCallback) {
// Okay, we've found a variable, and there's some vanilla
// text that's been buffered up. Flush it.
(*aTextCallback)(this, Substring(aAttributeValue, mark, backup - mark), aClosure);
(*aTextCallback)(this, Substring(aAttributeValue, NS_STATIC_CAST(PRUint32, mark),
NS_STATIC_CAST(PRUint32, backup - mark)), aClosure);
}
// Construct a substring that is the symbol we need to look up
@ -5012,13 +5013,15 @@ nsXULTemplateBuilder::ParseAttribute(const nsAReadableString& aAttributeValue,
if (c != PRUnichar('^'))
--i;
(*aVariableCallback)(this, Substring(aAttributeValue, first, last - first), aClosure);
(*aVariableCallback)(this, Substring(aAttributeValue, NS_STATIC_CAST(PRUint32, first),
NS_STATIC_CAST(PRUint32, last - first)), aClosure);
mark = i + 1;
}
if (backup != mark && aTextCallback) {
// If there's any text left over, then fire the text callback
(*aTextCallback)(this, Substring(aAttributeValue, mark, backup - mark), aClosure);
(*aTextCallback)(this, Substring(aAttributeValue, NS_STATIC_CAST(PRUint32, mark),
NS_STATIC_CAST(PRUint32, backup - mark)), aClosure);
}
}
@ -7475,7 +7478,8 @@ nsXULTemplateBuilder::AddBindingsFor(nsXULTemplateBuilder* aThis,
{
// We should *only* be recieving "rdf:"-style variables. Make
// sure...
if (Substring(aVariable, 0, 4) != NS_LITERAL_STRING("rdf:"))
if (Substring(aVariable, NS_STATIC_CAST(PRUint32, 0),
NS_STATIC_CAST(PRUint32, 4)) != NS_LITERAL_STRING("rdf:"))
return;
Rule* rule = NS_STATIC_CAST(Rule*, aClosure);
@ -7488,7 +7492,8 @@ nsXULTemplateBuilder::AddBindingsFor(nsXULTemplateBuilder* aThis,
// Strip it down to the raw RDF property by clobbering the "rdf:"
// prefix
const nsAReadableString& propertyStr = Substring(aVariable, 4, aVariable.Length() - 4);
const nsAReadableString& propertyStr = Substring(aVariable, NS_STATIC_CAST(PRUint32, 4),
aVariable.Length() - 4);
nsCOMPtr<nsIRDFResource> property;
gRDFService->GetUnicodeResource(nsPromiseFlatString(propertyStr), getter_AddRefs(property));