i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* fix gcc4 build of cppunit library by explicitly spelling out std:: in

Browse Source 
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:
Oliver Tappe
2009-05-02 19:04:52 +00:00
parent 226136446a
commit 58481f0f6e
50 changed files with 683 additions and 605 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/tools/cppunit/cppunit/XmlOutputter.h
+22 -22
View File
@@ -33,11 +33,11 @@ public:
/*! Constructs a XmlOutputter object.
* \param result Result of the test run.
* \param stream Stream used to output the XML output.
* \param encoding Encoding used in the XML file (default is Latin-1).
* \param encoding Encoding used in the XML file (default is Latin-1).
*/
XmlOutputter( TestResultCollector *result,
ostream &stream,
string encoding = "ISO-8859-1" );
std::ostream &stream,
std::string encoding = "ISO-8859-1" );
/// Destructor.
virtual ~XmlOutputter();
@@ -56,33 +56,33 @@ public:
class CPPUNIT_API Node
{
public:
Node( string elementName,
string content ="" );
Node( string elementName,
Node( std::string elementName,
std::string content ="" );
Node( std::string elementName,
int numericContent );
virtual ~Node();
void addAttribute( string attributeName,
string value );
void addAttribute( string attributeName,
void addAttribute( std::string attributeName,
std::string value );
void addAttribute( std::string attributeName,
int numericValue );
void addNode( Node *node );
string toString() const;
std::string toString() const;
private:
typedef pair<string,string> Attribute;
typedef std::pair<std::string,std::string> Attribute;
string attributesAsString() const;
string escape( string value ) const;
static string asString( int value );
std::string attributesAsString() const;
std::string escape( std::string value ) const;
static std::string asString( int value );
private:
string m_name;
string m_content;
typedef deque<Attribute> Attributes;
std::string m_name;
std::string m_content;
typedef std::deque<Attribute> Attributes;
Attributes m_attributes;
typedef deque<Node *> Nodes;
typedef std::deque<Node *> Nodes;
Nodes m_nodes;
};
@@ -90,7 +90,7 @@ public:
virtual void writeProlog();
virtual void writeTestsResult();
typedef map<Test *,TestFailure*> FailedTests;
typedef std::map<Test *,TestFailure*> FailedTests;
virtual Node *makeRootNode();
virtual void addFailedTests( FailedTests &failedTests,
Node *rootNode );
@@ -103,7 +103,7 @@ public:
Node *testsNode );
virtual void addFailureLocation( TestFailure *failure,
Node *testNode );
virtual void addSucessfulTest( Test *test,
virtual void addSucessfulTest( Test *test,
int testNumber,
Node *testsNode );
protected:
@@ -111,8 +111,8 @@ protected:
protected:
TestResultCollector *m_result;
ostream &m_stream;
string m_encoding;
std::ostream &m_stream;
std::string m_encoding;
private:
/// Prevents the use of the copy constructor.