generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-02-24 23:34:47 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'poco-1.10.0-modernize' of github.com:pocoproject/poco into poco-1.10.0-modernize

Browse Source
This commit is contained in:
Günter Obiltschnig 2020-01-09 19:29:58 +01:00
commit 950085520a
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CppUnit/src/TextTestResult.cpp
View File

@ -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);
}

4
Foundation/src/BinaryReader.cpp
View File

@ -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;
}

4
Foundation/testsuite/src/ChannelTest.cpp
View File

@ -59,8 +59,8 @@ void ChannelTest::testSplitter()
{
AutoPtr<TestChannel> pChannel = new TestChannel;
AutoPtr<SplitterChannel> pSplitter = new SplitterChannel;
pSplitter->addChannel(pChannel.get());
pSplitter->addChannel(pChannel.get());
pSplitter->addChannel(pChannel);
pSplitter->addChannel(pChannel);
Message msg;
pSplitter->log(msg);
assertTrue (pChannel->list().size() == 2);