mirror of
https://github.com/jezhiggins/arabica
synced 2024-12-26 21:58:39 +01:00
Resolved 64-bit specific warnings.
This commit is contained in:
parent
50fc53d940
commit
99fd2cf41a
6 changed files with 12 additions and 12 deletions
|
@ -66,7 +66,7 @@ public:
|
|||
if(other.precedence_.size() <= precedence_.size())
|
||||
return false;
|
||||
|
||||
for(int i = 0, ie = precedence_.size(); i != ie; ++i)
|
||||
for(size_t i = 0, ie = precedence_.size(); i != ie; ++i)
|
||||
if(other.precedence_[i] != precedence_[i])
|
||||
return false;
|
||||
|
||||
|
@ -93,8 +93,8 @@ bool operator<(const Precedence& lhs, const Precedence& rhs)
|
|||
if(lhs.precedence_ == rhs.precedence_)
|
||||
return false;
|
||||
|
||||
int len = (std::min)(lhs.precedence_.size(), rhs.precedence_.size());
|
||||
for(int c = 0; c != len; ++c)
|
||||
size_t len = (std::min)(lhs.precedence_.size(), rhs.precedence_.size());
|
||||
for(size_t c = 0; c != len; ++c)
|
||||
{
|
||||
if(lhs.precedence_[c] < rhs.precedence_[c])
|
||||
return true;
|
||||
|
|
|
@ -182,7 +182,7 @@ void URI::combinePath(const std::string& relPath)
|
|||
size_t dots = path_.find("/../", from);
|
||||
while(dots != std::string::npos)
|
||||
{
|
||||
int preceding_slash = (dots > 0) ? path_.rfind(FORWARD_SLASH, dots-1) : 0;
|
||||
size_t preceding_slash = (dots > 0) ? path_.rfind(FORWARD_SLASH, dots-1) : 0;
|
||||
path_.erase(preceding_slash, dots+3-preceding_slash);
|
||||
dots = path_.find("/../", preceding_slash);
|
||||
} // while
|
||||
|
|
|
@ -83,7 +83,7 @@ class characterdataappenddata : public DOMTestCase<string_type, string_adaptor>
|
|||
Node nameNode;
|
||||
CharacterData child;
|
||||
String childValue;
|
||||
int childLength;
|
||||
size_t childLength;
|
||||
doc = (Document) baseT::load("staff", true);
|
||||
elementList = doc.getElementsByTagName(SA::construct_from_utf8("name"));
|
||||
nameNode = elementList.item(0);
|
||||
|
@ -91,7 +91,7 @@ class characterdataappenddata : public DOMTestCase<string_type, string_adaptor>
|
|||
child.appendData(SA::construct_from_utf8(", Esquire"));
|
||||
childValue = child.getData();
|
||||
childLength = SA::length(childValue);
|
||||
baseT::assertEquals(24, childLength, __LINE__, __FILE__);
|
||||
baseT::assertEquals(24, static_cast<int>(childLength), __LINE__, __FILE__);
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -79,14 +79,14 @@ class characterdatagetlength : public DOMTestCase<string_type, string_adaptor>
|
|||
Node nameNode;
|
||||
CharacterData child;
|
||||
String childValue;
|
||||
int childLength;
|
||||
size_t childLength;
|
||||
doc = (Document) baseT::load("staff", false);
|
||||
elementList = doc.getElementsByTagName(SA::construct_from_utf8("name"));
|
||||
nameNode = elementList.item(0);
|
||||
child = (CharacterData) nameNode.getFirstChild();
|
||||
childValue = child.getData();
|
||||
childLength = SA::length(childValue);
|
||||
baseT::assertEquals(15, childLength, __LINE__, __FILE__);
|
||||
baseT::assertEquals(15, static_cast<int>(childLength), __LINE__, __FILE__);
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -82,7 +82,7 @@ class hc_characterdataappenddata : public DOMTestCase<string_type, string_adapto
|
|||
Node nameNode;
|
||||
CharacterData child;
|
||||
String childValue;
|
||||
int childLength;
|
||||
size_t childLength;
|
||||
doc = (Document) baseT::load("hc_staff", true);
|
||||
elementList = doc.getElementsByTagName(SA::construct_from_utf8("strong"));
|
||||
nameNode = elementList.item(0);
|
||||
|
@ -90,7 +90,7 @@ class hc_characterdataappenddata : public DOMTestCase<string_type, string_adapto
|
|||
child.appendData(SA::construct_from_utf8(", Esquire"));
|
||||
childValue = child.getData();
|
||||
childLength = SA::length(childValue);
|
||||
baseT::assertEquals(24, childLength, __LINE__, __FILE__);
|
||||
baseT::assertEquals(24, static_cast<int>(childLength), __LINE__, __FILE__);
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -78,14 +78,14 @@ class hc_characterdatagetlength : public DOMTestCase<string_type, string_adaptor
|
|||
Node nameNode;
|
||||
CharacterData child;
|
||||
String childValue;
|
||||
int childLength;
|
||||
size_t childLength;
|
||||
doc = (Document) baseT::load("hc_staff", false);
|
||||
elementList = doc.getElementsByTagName(SA::construct_from_utf8("strong"));
|
||||
nameNode = elementList.item(0);
|
||||
child = (CharacterData) nameNode.getFirstChild();
|
||||
childValue = child.getData();
|
||||
childLength = SA::length(childValue);
|
||||
baseT::assertEquals(15, childLength, __LINE__, __FILE__);
|
||||
baseT::assertEquals(15, static_cast<int>(childLength), __LINE__, __FILE__);
|
||||
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue