mirror of
https://github.com/pocoproject/poco.git
synced 2025-04-17 07:13:27 +02:00
Merge branch 'poco-1.10.0-modernize' of github.com:pocoproject/poco into poco-1.10.0-modernize
This commit is contained in:
commit
c462b76b08
@ -41,8 +41,6 @@ TextTestResult::TextTestResult(const std::string& ignore):
|
||||
if (line[0] == '#')
|
||||
continue;
|
||||
std::string ignored(line);
|
||||
std::string::const_iterator it = ignored.begin();
|
||||
std::string::const_iterator end = ignored.end();
|
||||
ignoring(ignored);
|
||||
}
|
||||
ifs.close();
|
||||
@ -78,8 +76,6 @@ TextTestResult::TextTestResult(std::ostream& ostr, const std::string& ignore) :
|
||||
if (line[0] == '#')
|
||||
continue;
|
||||
std::string ignored(line);
|
||||
std::string::const_iterator it = ignored.begin();
|
||||
std::string::const_iterator end = ignored.end();
|
||||
ignoring(ignored);
|
||||
}
|
||||
ifs.close();
|
||||
@ -113,8 +109,6 @@ void TextTestResult::setup()
|
||||
if (env)
|
||||
{
|
||||
std::string ignored = env;
|
||||
std::string::const_iterator it = ignored.begin();
|
||||
std::string::const_iterator end = ignored.end();
|
||||
ignoring(ignored);
|
||||
}
|
||||
|
||||
|
@ -176,7 +176,7 @@ BinaryReader& BinaryReader::operator >> (double& value)
|
||||
BinaryReader& BinaryReader::operator >> (long long& value)
|
||||
{
|
||||
_istr.read((char*) &value, sizeof(value));
|
||||
if (_flipBytes) value = ByteOrder::flipBytes(value);
|
||||
if (_flipBytes) value = ByteOrder::flipBytes(static_cast<Poco::Int64>(value));
|
||||
return *this;
|
||||
}
|
||||
|
||||
@ -184,7 +184,7 @@ BinaryReader& BinaryReader::operator >> (long long& value)
|
||||
BinaryReader& BinaryReader::operator >> (unsigned long long& value)
|
||||
{
|
||||
_istr.read((char*) &value, sizeof(value));
|
||||
if (_flipBytes) value = ByteOrder::flipBytes(value);
|
||||
if (_flipBytes) value = ByteOrder::flipBytes(static_cast<Poco::UInt64>(value));
|
||||
return *this;
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user