generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-24 09:12:28 +02:00
Code Issues Projects Releases Wiki Activity

Revert "GH #1050 Zip: fix gcc -Wshadow warnings"

Browse Source
This commit is contained in:
Günter Obiltschnig
2016-09-05 08:29:59 +02:00
committed by GitHub
parent 09036152b8
commit 289b05c8b3
9 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CppUnit/include/Poco/CppUnit/CppUnitException.h
View File

@@ -68,17 +68,17 @@ inline CppUnitException::CppUnitException(const CppUnitException& other): except
}
inline CppUnitException::CppUnitException (const std::string& message, long line, const std::string& rFileName): _message(message), _lineNumber(line), _data1lineNumber(CPPUNIT_UNKNOWNLINENUMBER), _data2lineNumber(CPPUNIT_UNKNOWNLINENUMBER), _fileName(rFileName)
inline CppUnitException::CppUnitException (const std::string& message, long lineNumber, const std::string& fileName): _message(message), _lineNumber(lineNumber), _data1lineNumber(CPPUNIT_UNKNOWNLINENUMBER), _data2lineNumber(CPPUNIT_UNKNOWNLINENUMBER), _fileName(fileName)
{
}
inline CppUnitException::CppUnitException (const std::string& message, long line, long data1lineNumber, const std::string& rFileName): _message(message), _lineNumber(line), _data1lineNumber(data1lineNumber), _data2lineNumber(CPPUNIT_UNKNOWNLINENUMBER), _fileName(rFileName)
inline CppUnitException::CppUnitException (const std::string& message, long lineNumber, long data1lineNumber, const std::string& fileName): _message(message), _lineNumber(lineNumber), _data1lineNumber(data1lineNumber), _data2lineNumber(CPPUNIT_UNKNOWNLINENUMBER), _fileName(fileName)
{
}
inline CppUnitException::CppUnitException (const std::string& message, long line, long data1lineNumber, long data2lineNumber, const std::string& rFileName): _message(message), _lineNumber(line), _data1lineNumber(data1lineNumber), _data2lineNumber(data2lineNumber), _fileName(rFileName)
inline CppUnitException::CppUnitException (const std::string& message, long lineNumber, long data1lineNumber, long data2lineNumber, const std::string& fileName): _message(message), _lineNumber(lineNumber), _data1lineNumber(data1lineNumber), _data2lineNumber(data2lineNumber), _fileName(fileName)
{
}

6
CppUnit/include/Poco/CppUnit/TestCaller.h
View File

@@ -56,10 +56,10 @@ class TestCaller: public TestCase
typedef void (Fixture::*TestMethod)();
public:
TestCaller(const std::string& rName, TestMethod test):
TestCase(rName),
TestCaller(const std::string& name, TestMethod test):
TestCase(name),
_test(test),
_fixture(new Fixture(rName))
_fixture(new Fixture(name))
{
}

2
CppUnit/include/Poco/CppUnit/TestCase.h
View File

@@ -173,7 +173,7 @@ protected:
// Constructs a test case
inline TestCase::TestCase(const std::string& rName): _name (rName)
inline TestCase::TestCase(const std::string& name): _name (name)
{
}

2
CppUnit/include/Poco/CppUnit/TestFailure.h
View File

@@ -52,7 +52,7 @@ protected:
// Constructs a TestFailure with the given test and exception.
inline TestFailure::TestFailure(Test* pFailedTest, CppUnitException* pThrownException): _failedTest(pFailedTest), _thrownException(pThrownException)
inline TestFailure::TestFailure(Test* failedTest, CppUnitException* thrownException): _failedTest(failedTest), _thrownException(thrownException)
{
}