* fix gcc4 build of cppunit library by explicitly spelling out std:: in
the headers and importing the required classes in the implementation files * automatic whitespace cleanup git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30586 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -19,16 +19,16 @@ public:
|
||||
* \param additionalMessage Additionnal information provided to further qualify
|
||||
* the inequality.
|
||||
*/
|
||||
NotEqualException( string expected,
|
||||
string actual,
|
||||
NotEqualException( std::string expected,
|
||||
std::string actual,
|
||||
SourceLine sourceLine = SourceLine(),
|
||||
string additionalMessage = "" );
|
||||
std::string additionalMessage = "" );
|
||||
|
||||
#ifdef CPPUNIT_ENABLE_SOURCELINE_DEPRECATED
|
||||
NotEqualException( string expected,
|
||||
string actual,
|
||||
long lineNumber,
|
||||
string fileName );
|
||||
NotEqualException( std::string expected,
|
||||
std::string actual,
|
||||
long lineNumber,
|
||||
std::string fileName );
|
||||
#endif
|
||||
|
||||
NotEqualException( const NotEqualException &other );
|
||||
@@ -36,11 +36,11 @@ public:
|
||||
|
||||
virtual ~NotEqualException() throw();
|
||||
|
||||
string expectedValue() const;
|
||||
std::string expectedValue() const;
|
||||
|
||||
string actualValue() const;
|
||||
std::string actualValue() const;
|
||||
|
||||
string additionalMessage() const;
|
||||
std::string additionalMessage() const;
|
||||
|
||||
/*! Copy operator.
|
||||
* @param other Object to copy.
|
||||
@@ -55,9 +55,9 @@ public:
|
||||
static Type type();
|
||||
|
||||
private:
|
||||
string m_expected;
|
||||
string m_actual;
|
||||
string m_additionalMessage;
|
||||
std::string m_expected;
|
||||
std::string m_actual;
|
||||
std::string m_additionalMessage;
|
||||
};
|
||||
|
||||
} // namespace CppUnit
|
||||
|
||||
Reference in New Issue
Block a user