You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by ga...@apache.org on 2003/05/30 15:08:28 UTC
cvs commit: xml-xerces/c/tests/UtilTests CoreTests.hpp CoreTestsMain.cpp CoreTests_BitSet.cpp CoreTests_CountedPointer.cpp CoreTests_RefArray.cpp CoreTests_RefHashTable.cpp CoreTests_RefStack.cpp CoreTests_RefVector.cpp CoreTests_String.cpp CoreTests_Transcoders.cpp CoreTests_URL.cpp CoreTests_ValueArray.cpp CoreTests_ValueStack.cpp CoreTests_ValueVector.cpp
gareth 2003/05/30 06:08:28
Modified: c/tests configure
c/tests/DOM/DeprecatedDOMCount DeprecatedDOMCount.cpp
DeprecatedDOMCount.hpp
c/tests/DOM/Normalizer Normalizer.cpp
c/tests/DOM/TypeInfo TypeInfo.cpp
c/tests/InitTermTest InitTermTest.cpp InitTermTest.hpp
c/tests/ParserTest ParserTest.cpp ParserTest.hpp
ParserTest_Parser.cpp
c/tests/UtilTests CoreTests.hpp CoreTestsMain.cpp
CoreTests_BitSet.cpp CoreTests_CountedPointer.cpp
CoreTests_RefArray.cpp CoreTests_RefHashTable.cpp
CoreTests_RefStack.cpp CoreTests_RefVector.cpp
CoreTests_String.cpp CoreTests_Transcoders.cpp
CoreTests_URL.cpp CoreTests_ValueArray.cpp
CoreTests_ValueStack.cpp CoreTests_ValueVector.cpp
Log:
move over to macros for std:: and iostream/iostream.h issues.
Revision Changes Path
1.28 +2 -2 xml-xerces/c/tests/configure
Index: configure
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/configure,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- configure 14 May 2003 19:26:20 -0000 1.27
+++ configure 30 May 2003 13:08:24 -0000 1.28
@@ -890,8 +890,8 @@
for ac_declaration in \
''\
'#include <stdlib.h>' \
- 'extern "C" void std::exit (int) throw (); using std::exit;' \
- 'extern "C" void std::exit (int); using std::exit;' \
+ 'extern "C" void XERCES_STD_QUALIFIER exit (int) throw (); using XERCES_STD_QUALIFIER exit;' \
+ 'extern "C" void XERCES_STD_QUALIFIER exit (int); using XERCES_STD_QUALIFIER exit;' \
'extern "C" void exit (int) throw ();' \
'extern "C" void exit (int);' \
'void exit (int);'
1.6 +30 -25 xml-xerces/c/tests/DOM/DeprecatedDOMCount/DeprecatedDOMCount.cpp
Index: DeprecatedDOMCount.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/DOM/DeprecatedDOMCount/DeprecatedDOMCount.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DeprecatedDOMCount.cpp 4 Nov 2002 14:09:27 -0000 1.5
+++ DeprecatedDOMCount.cpp 30 May 2003 13:08:24 -0000 1.6
@@ -69,7 +69,12 @@
#include "DeprecatedDOMCount.hpp"
#include <string.h>
#include <stdlib.h>
+
+#if defined(XERCES_NEW_IOSTREAMS)
+#include <fstream>
+#else
#include <fstream.h>
+#endif
@@ -80,7 +85,7 @@
// ---------------------------------------------------------------------------
void usage()
{
- cout << "\nUsage:\n"
+ XERCES_STD_QUALIFIER cout << "\nUsage:\n"
" DeprecatedDOMCount [options] <XML file | List file>\n\n"
"This program invokes the DOM parser, builds the DOM tree,\n"
"and then prints the number of elements found in each XML file.\n\n"
@@ -93,7 +98,7 @@
" -f Enable full schema constraint checking. Defaults to off.\n"
" -? Show this help.\n\n"
" * = Default if not provided explicitly.\n"
- << endl;
+ << XERCES_STD_QUALIFIER endl;
}
@@ -107,8 +112,8 @@
catch (const XMLException& toCatch)
{
- cerr << "Error during initialization! :\n"
- << StrX(toCatch.getMessage()) << endl;
+ XERCES_STD_QUALIFIER cerr << "Error during initialization! :\n"
+ << StrX(toCatch.getMessage()) << XERCES_STD_QUALIFIER endl;
return 1;
}
@@ -155,7 +160,7 @@
valScheme = DOMParser::Val_Always;
else
{
- cerr << "Unknown -v= value: " << parm << endl;
+ XERCES_STD_QUALIFIER cerr << "Unknown -v= value: " << parm << XERCES_STD_QUALIFIER endl;
return 2;
}
}
@@ -189,8 +194,8 @@
}
else
{
- cerr << "Unknown option '" << argV[argInd]
- << "', ignoring it\n" << endl;
+ XERCES_STD_QUALIFIER cerr << "Unknown option '" << argV[argInd]
+ << "', ignoring it\n" << XERCES_STD_QUALIFIER endl;
}
}
@@ -222,14 +227,14 @@
unsigned long duration;
bool more = true;
- ifstream fin;
+ XERCES_STD_QUALIFIER ifstream fin;
// the input is a list file
if (doList)
fin.open(argV[argInd]);
if (fin.fail()) {
- cerr <<"Cannot open the list file: " << argV[argInd] << endl;
+ XERCES_STD_QUALIFIER cerr <<"Cannot open the list file: " << argV[argInd] << XERCES_STD_QUALIFIER endl;
return 2;
}
@@ -246,7 +251,7 @@
continue;
else {
xmlFile = fURI;
- cerr << "==Parsing== " << xmlFile << endl;
+ XERCES_STD_QUALIFIER cerr << "==Parsing== " << xmlFile << XERCES_STD_QUALIFIER endl;
}
}
else
@@ -270,23 +275,23 @@
catch (const XMLException& toCatch)
{
- cerr << "\nError during parsing: '" << xmlFile << "'\n"
+ XERCES_STD_QUALIFIER cerr << "\nError during parsing: '" << xmlFile << "'\n"
<< "Exception message is: \n"
- << StrX(toCatch.getMessage()) << "\n" << endl;
+ << StrX(toCatch.getMessage()) << "\n" << XERCES_STD_QUALIFIER endl;
errorOccurred = true;
continue;
}
catch (const DOM_DOMException& toCatch)
{
- cerr << "\nDOM Error during parsing: '" << xmlFile << "'\n"
+ XERCES_STD_QUALIFIER cerr << "\nDOM Error during parsing: '" << xmlFile << "'\n"
<< "DOMException code is: \n"
- << toCatch.code << "\n" << endl;
+ << toCatch.code << "\n" << XERCES_STD_QUALIFIER endl;
errorOccurred = true;
continue;
}
catch (...)
{
- cerr << "\nUnexpected exception during parsing: '" << xmlFile << "'\n";
+ XERCES_STD_QUALIFIER cerr << "\nUnexpected exception during parsing: '" << xmlFile << "'\n";
errorOccurred = true;
continue;
}
@@ -297,7 +302,7 @@
//
if (errorHandler.getSawErrors())
{
- cout << "\nErrors occurred, no output available\n" << endl;
+ XERCES_STD_QUALIFIER cout << "\nErrors occurred, no output available\n" << XERCES_STD_QUALIFIER endl;
errorOccurred = true;
}
else
@@ -306,8 +311,8 @@
unsigned int elementCount = doc.getElementsByTagName("*").getLength();
// Print out the stats that we collected and time taken.
- cout << xmlFile << ": " << duration << " ms ("
- << elementCount << " elems)." << endl;
+ XERCES_STD_QUALIFIER cout << xmlFile << ": " << duration << " ms ("
+ << elementCount << " elems)." << XERCES_STD_QUALIFIER endl;
}
}
@@ -347,27 +352,27 @@
void DeprecatedDOMCountErrorHandler::error(const SAXParseException& e)
{
fSawErrors = true;
- cerr << "\nError at file " << StrX(e.getSystemId())
+ XERCES_STD_QUALIFIER cerr << "\nError at file " << StrX(e.getSystemId())
<< ", line " << e.getLineNumber()
<< ", char " << e.getColumnNumber()
- << "\n Message: " << StrX(e.getMessage()) << endl;
+ << "\n Message: " << StrX(e.getMessage()) << XERCES_STD_QUALIFIER endl;
}
void DeprecatedDOMCountErrorHandler::fatalError(const SAXParseException& e)
{
fSawErrors = true;
- cerr << "\nFatal Error at file " << StrX(e.getSystemId())
+ XERCES_STD_QUALIFIER cerr << "\nFatal Error at file " << StrX(e.getSystemId())
<< ", line " << e.getLineNumber()
<< ", char " << e.getColumnNumber()
- << "\n Message: " << StrX(e.getMessage()) << endl;
+ << "\n Message: " << StrX(e.getMessage()) << XERCES_STD_QUALIFIER endl;
}
void DeprecatedDOMCountErrorHandler::warning(const SAXParseException& e)
{
- cerr << "\nWarning at file " << StrX(e.getSystemId())
+ XERCES_STD_QUALIFIER cerr << "\nWarning at file " << StrX(e.getSystemId())
<< ", line " << e.getLineNumber()
<< ", char " << e.getColumnNumber()
- << "\n Message: " << StrX(e.getMessage()) << endl;
+ << "\n Message: " << StrX(e.getMessage()) << XERCES_STD_QUALIFIER endl;
}
void DeprecatedDOMCountErrorHandler::resetErrors()
1.5 +9 -3 xml-xerces/c/tests/DOM/DeprecatedDOMCount/DeprecatedDOMCount.hpp
Index: DeprecatedDOMCount.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/DOM/DeprecatedDOMCount/DeprecatedDOMCount.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DeprecatedDOMCount.hpp 5 Feb 2003 18:55:20 -0000 1.4
+++ DeprecatedDOMCount.hpp 30 May 2003 13:08:24 -0000 1.5
@@ -62,7 +62,13 @@
// Includes
// ---------------------------------------------------------------------------
#include <xercesc/sax/ErrorHandler.hpp>
+#include <xercesc/util/PlatformUtils.hpp>
+#if defined(XERCES_NEW_IOSTREAMS)
+#include <iostream>
+#else
#include <iostream.h>
+#endif
+
XERCES_CPP_NAMESPACE_USE
@@ -159,9 +165,9 @@
char* fLocalForm;
};
-inline ostream& operator<<(ostream& target, const StrX& toDump)
+inline XERCES_STD_QUALIFIER ostream& operator<<(XERCES_STD_QUALIFIER ostream& target, const StrX& toDump)
{
- target << toDump.localForm();
+ target << toDump.localForm();
return target;
}
1.3 +28 -23 xml-xerces/c/tests/DOM/Normalizer/Normalizer.cpp
Index: Normalizer.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/DOM/Normalizer/Normalizer.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Normalizer.cpp 22 May 2003 19:32:45 -0000 1.2
+++ Normalizer.cpp 30 May 2003 13:08:25 -0000 1.3
@@ -60,7 +60,12 @@
#include <xercesc/framework/XMLBuffer.hpp>
#include <xercesc/parsers/XercesDOMParser.hpp>
+#if defined(XERCES_NEW_IOSTREAMS)
+#include <iostream>
+#else
#include <iostream.h>
+#endif
+
#include <xercesc/util/XMLUni.hpp>
#include <xercesc/util/XMLUniDefs.hpp>
#include "../../../src/xercesc/dom/impl/DOMConfigurationImpl.hpp"
@@ -162,9 +167,9 @@
catch(const XMLException &toCatch)
{
- cerr << "Error during Xerces-c Initialization.\n"
+ XERCES_STD_QUALIFIER cerr << "Error during Xerces-c Initialization.\n"
<< " Exception message:"
- << StrX(toCatch.getMessage()) << endl;
+ << StrX(toCatch.getMessage()) << XERCES_STD_QUALIFIER endl;
}
parser = 0;
@@ -180,13 +185,13 @@
while(child != 0) {
if(child->getNodeType() == DOMNode::ENTITY_REFERENCE_NODE) {
- cout << "start of entity ref node" << endl;
+ XERCES_STD_QUALIFIER cout << "start of entity ref node" << XERCES_STD_QUALIFIER endl;
DOMNode *entChild = ((DOMEntityReference*)child)->getFirstChild();
while(entChild != 0) {
serializeNode(entChild);
entChild = entChild->getNextSibling();
}
- cout << "\nend of entity ref node\n\n" << endl;
+ XERCES_STD_QUALIFIER cout << "\nend of entity ref node\n\n" << XERCES_STD_QUALIFIER endl;
}
@@ -204,20 +209,20 @@
{
// Display whatever error message passed from the serializer
if (domError.getSeverity() == DOMError::DOM_SEVERITY_WARNING)
- cerr << "\nWarning Message: ";
+ XERCES_STD_QUALIFIER cerr << "\nWarning Message: ";
else if (domError.getSeverity() == DOMError::DOM_SEVERITY_ERROR)
- cerr << "\nError Message: ";
+ XERCES_STD_QUALIFIER cerr << "\nError Message: ";
else
- cerr << "\nFatal Message: ";
+ XERCES_STD_QUALIFIER cerr << "\nFatal Message: ";
char *msg = XMLString::transcode(domError.getMessage());
- cerr<< msg <<endl;
+ XERCES_STD_QUALIFIER cerr<< msg <<XERCES_STD_QUALIFIER endl;
XMLString::release(&msg);
- cerr << "Related data ";
+ XERCES_STD_QUALIFIER cerr << "Related data ";
msg = XMLString::transcode(((DOMNode*)domError.getRelatedData())->getNodeName());
- cerr<< msg <<endl;
+ XERCES_STD_QUALIFIER cerr << msg <<XERCES_STD_QUALIFIER endl;
XMLString::release(&msg);
@@ -264,20 +269,20 @@
//create default ns
doc->normalizeDocument();
normalizer->serializeNode(doc);
- cout << "\n\n";
+ XERCES_STD_QUALIFIER cout << "\n\n";
//add in binding
docFirstElement->setPrefix(X("po"));
doc->normalizeDocument();
normalizer->serializeNode(doc);
- cout << "\n\n";
+ XERCES_STD_QUALIFIER cout << "\n\n";
//use default
DOMElement* docFirstElementChildChild = doc->createElementNS(X("http://www.test2.com"),X("docEleChildChild"));
docFirstElementChild->appendChild(docFirstElementChildChild);
doc->normalizeDocument();
normalizer->serializeNode(doc);
- cout << "\n\n";
+ XERCES_STD_QUALIFIER cout << "\n\n";
//use a binding
XMLBuffer buf;
@@ -290,7 +295,7 @@
docFirstElementChild->setPrefix(X("po2"));
doc->normalizeDocument();
normalizer->serializeNode(doc);
- cout << "\n\n";
+ XERCES_STD_QUALIFIER cout << "\n\n";
//some siblngs to ensure the scope stacks are working
docFirstElementChildChild = doc->createElementNS(X("http://www.test3.com"),X("docEleChildChild2"));
@@ -301,13 +306,13 @@
docFirstElementChild->appendChild(docFirstElementChildChild);
doc->normalizeDocument();
normalizer->serializeNode(doc);
- cout << "\n\n";
+ XERCES_STD_QUALIFIER cout << "\n\n";
//conflicting prefix
docFirstElementChildChild->setAttributeNS(XMLUni::fgXMLNSURIName, X("po4"), X("conflict"));
doc->normalizeDocument();
normalizer->serializeNode(doc);
- cout << "\n\n";
+ XERCES_STD_QUALIFIER cout << "\n\n";
//conflicting default
docFirstElementChildChild = doc->createElementNS(X("http://www.test4.com"),X("docEleChildChild5"));
@@ -315,14 +320,14 @@
docFirstElementChildChild->setAttributeNS(XMLUni::fgXMLNSURIName, XMLUni::fgXMLNSString, X("conflict"));
doc->normalizeDocument();
normalizer->serializeNode(doc);
- cout << "\n\n";
+ XERCES_STD_QUALIFIER cout << "\n\n";
//set the xmlns to ""
DOMElement *noNamespaceEle = doc->createElementNS(X(""),X("noNamespace"));
docFirstElementChildChild->appendChild(noNamespaceEle);
doc->normalizeDocument();
normalizer->serializeNode(doc);
- cout << "\n\n";
+ XERCES_STD_QUALIFIER cout << "\n\n";
//now lets do a bit off attribute testing on the doc ele
@@ -335,7 +340,7 @@
docFirstElement->setAttributeNS(X("http://testattr3.com"), X("po3:attr7"), X("value"));
doc->normalizeDocument();
normalizer->serializeNode(doc);
- cout << "\n\n";
+ XERCES_STD_QUALIFIER cout << "\n\n";
//and now on one of its children
docFirstElementChildChild->setAttributeNS(X("http://testattr.com"), X("attr1"), X("value"));
@@ -357,7 +362,7 @@
doc->normalizeDocument();
normalizer->serializeNode(doc);
- cout << "\n\n";
+ XERCES_STD_QUALIFIER cout << "\n\n";
//2 prefix with the same uri
@@ -369,7 +374,7 @@
docFirstElementChildChild->setAttributeNS(X("http://www.uri1.com"), X("uri1b:attr2"), X("value"));
doc->normalizeDocument();
normalizer->serializeNode(doc);
- cout << "\n\n";
+ XERCES_STD_QUALIFIER cout << "\n\n";
//check to see we use the nearest binding and for more inheritence
DOMElement *docFirstElementChildChildChild = doc->createElementNS(X("http://www.uri1.com"),X("docEleChildChildChild"));
@@ -379,7 +384,7 @@
docFirstElementChildChildChild->setAttributeNS(X("http://www.test.com"), X("attr1"), X("value"));
doc->normalizeDocument();
normalizer->serializeNode(doc);
- cout << "\n\n";
+ XERCES_STD_QUALIFIER cout << "\n\n";
//NS1.1 stuff
@@ -400,7 +405,7 @@
//check error conditions
- cout << "error conditions" << endl;
+ XERCES_STD_QUALIFIER cout << "error conditions" << XERCES_STD_QUALIFIER endl;
DOMConfigurationImpl *cImpl = new ((DOMDocumentImpl*)doc) DOMConfigurationImpl();
((DOMDocumentImpl*)doc)->setDOMConfiguration(cImpl);
1.5 +20 -15 xml-xerces/c/tests/DOM/TypeInfo/TypeInfo.cpp
Index: TypeInfo.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/DOM/TypeInfo/TypeInfo.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TypeInfo.cpp 6 Feb 2003 13:52:33 -0000 1.4
+++ TypeInfo.cpp 30 May 2003 13:08:25 -0000 1.5
@@ -63,13 +63,18 @@
#include <xercesc/dom/DOMException.hpp>
#include <xercesc/dom/DOM.hpp>
#include <xercesc/validators/schema/SchemaSymbols.hpp>
+
+#if defined(XERCES_NEW_IOSTREAMS)
+#include <iostream>
+#else
#include <iostream.h>
+#endif
#define DOMTYPEINFOTEST(info, type, uri, line) \
tmp = XMLString::equals(info->getName(), type) && XMLString::equals(info->getNamespace(), uri);\
if(!tmp) { \
- cerr << "DOMTypeInfo test failed at line, " << line << "\nExpected values : typename '" << XMLString::transcode(type) << "', uri '" << XMLString::transcode(uri) << "'\nActual values : typename '" << XMLString::transcode(info->getName()) << "', uri '" << XMLString::transcode(info->getNamespace()) << "'\n" << endl; \
+ XERCES_STD_QUALIFIER cerr << "DOMTypeInfo test failed at line, " << line << "\nExpected values : typename '" << XMLString::transcode(type) << "', uri '" << XMLString::transcode(uri) << "'\nActual values : typename '" << XMLString::transcode(info->getName()) << "', uri '" << XMLString::transcode(info->getNamespace()) << "'\n" << XERCES_STD_QUALIFIER endl; \
passed = false; \
}
@@ -167,9 +172,9 @@
catch(const XMLException &toCatch)
{
- cerr << "Error during Xerces-c Initialization.\n"
+ XERCES_STD_QUALIFIER cerr << "Error during Xerces-c Initialization.\n"
<< " Exception message:"
- << StrX(toCatch.getMessage()) << endl;
+ << StrX(toCatch.getMessage()) << XERCES_STD_QUALIFIER endl;
}
parser = 0;
}
@@ -846,7 +851,7 @@
ti.doc = ti.parser->getDocument();
}
catch (...) {
- cerr << "parsing data/TypeInfo.xml failed at line" << __LINE__ << endl;
+ XERCES_STD_QUALIFIER cerr << "parsing data/TypeInfo.xml failed at line" << __LINE__ << XERCES_STD_QUALIFIER endl;
delete ti.parser;
return false;
}
@@ -864,7 +869,7 @@
passed &= ti.testInvaild();
}
else
- cout << "DOMTypeInfo test at line " << __LINE__ << "was not carried out" << endl;
+ XERCES_STD_QUALIFIER cout << "DOMTypeInfo test at line " << __LINE__ << "was not carried out" << XERCES_STD_QUALIFIER endl;
delete ti.parser;
@@ -880,7 +885,7 @@
ti.doc = ti.parser->getDocument();
}
catch (...) {
- cerr << "parsing data/TypeInfo.xml failed at line" << __LINE__ << endl;
+ XERCES_STD_QUALIFIER cerr << "parsing data/TypeInfo.xml failed at line" << __LINE__ << XERCES_STD_QUALIFIER endl;
delete ti.parser;
return false;
}
@@ -898,7 +903,7 @@
passed &= ti.testInvaild();
}
else
- cout << "DOMTypeInfo test at line " << __LINE__ << "was not carried out" << endl;
+ XERCES_STD_QUALIFIER cout << "DOMTypeInfo test at line " << __LINE__ << "was not carried out" << XERCES_STD_QUALIFIER endl;
delete ti.parser;
@@ -911,7 +916,7 @@
ti.doc = ti.parser->getDocument();
}
catch (...) {
- cerr << "parsing data/TypeInfo.xml failed at line" << __LINE__ << endl;
+ XERCES_STD_QUALIFIER cerr << "parsing data/TypeInfo.xml failed at line" << __LINE__ << XERCES_STD_QUALIFIER endl;
delete ti.parser;
return false;
}
@@ -921,7 +926,7 @@
passed &= ti.testDTD();
}
else
- cout << "DOMTypeInfo test at line " << __LINE__ << "was not carried out" << endl;
+ XERCES_STD_QUALIFIER cout << "DOMTypeInfo test at line " << __LINE__ << "was not carried out" << XERCES_STD_QUALIFIER endl;
delete ti.parser;
@@ -935,7 +940,7 @@
ti.doc = ti.parser->getDocument();
}
catch (...) {
- cerr << "parsing data/TypeInfo.xml failed at line" << __LINE__ << endl;
+ XERCES_STD_QUALIFIER cerr << "parsing data/TypeInfo.xml failed at line" << __LINE__ << XERCES_STD_QUALIFIER endl;
delete ti.parser;
return false;
}
@@ -945,7 +950,7 @@
passed &= ti.testDTD();
}
else
- cout << "DOMTypeInfo test at line " << __LINE__ << "was not carried out" << endl;
+ XERCES_STD_QUALIFIER cout << "DOMTypeInfo test at line " << __LINE__ << "was not carried out" << XERCES_STD_QUALIFIER endl;
delete ti.parser;
@@ -958,7 +963,7 @@
ti.doc = ti.parser->getDocument();
}
catch (...) {
- cerr << "parsing data/TypeInfo.xml failed at line" << __LINE__ << endl;
+ XERCES_STD_QUALIFIER cerr << "parsing data/TypeInfo.xml failed at line" << __LINE__ << XERCES_STD_QUALIFIER endl;
delete ti.parser;
return false;
}
@@ -968,15 +973,15 @@
passed &= ti.combinedTest();
}
else
- cout << "DOMTypeInfo test at line " << __LINE__ << "was not carried out" << endl;
+ XERCES_STD_QUALIFIER cout << "DOMTypeInfo test at line " << __LINE__ << "was not carried out" << XERCES_STD_QUALIFIER endl;
delete ti.parser;
if (!passed) {
- cerr << "test failed" << endl;
+ XERCES_STD_QUALIFIER cerr << "test failed" << XERCES_STD_QUALIFIER endl;
return 4;
}
- cerr << "Test Run Successfully" << endl;
+ XERCES_STD_QUALIFIER cerr << "Test Run Successfully" << XERCES_STD_QUALIFIER endl;
return 0;
}
1.7 +29 -24 xml-xerces/c/tests/InitTermTest/InitTermTest.cpp
Index: InitTermTest.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/InitTermTest/InitTermTest.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- InitTermTest.cpp 5 Feb 2003 18:55:21 -0000 1.6
+++ InitTermTest.cpp 30 May 2003 13:08:25 -0000 1.7
@@ -80,7 +80,12 @@
#include <string.h>
#include <stdlib.h>
+
+#if defined(XERCES_NEW_IOSTREAMS)
+#include <fstream>
+#else
#include <fstream.h>
+#endif
#include <limits.h>
@@ -129,8 +134,8 @@
\
catch (const XMLException& toCatch) \
{ \
- cerr << "Error during initialization! :\n" \
- << StrX(toCatch.getMessage()) << endl; \
+ XERCES_STD_QUALIFIER cerr << "Error during initialization! :\n" \
+ << StrX(toCatch.getMessage()) << XERCES_STD_QUALIFIER endl; \
return 1; \
} \
} \
@@ -143,8 +148,8 @@
\
catch (const XMLException& toCatch) \
{ \
- cerr << "Error during initialization! :\n" \
- << StrX(toCatch.getMessage()) << endl; \
+ XERCES_STD_QUALIFIER cerr << "Error during initialization! :\n" \
+ << StrX(toCatch.getMessage()) << XERCES_STD_QUALIFIER endl; \
return 1; \
} \
}
@@ -164,28 +169,28 @@
\
catch (const XMLException& toCatch) \
{ \
- cerr << "\nError during parsing: '" << xmlFile << "'\n" \
+ XERCES_STD_QUALIFIER cerr << "\nError during parsing: '" << xmlFile << "'\n" \
<< "Exception message is: \n" \
- << StrX(toCatch.getMessage()) << "\n" << endl; \
+ << StrX(toCatch.getMessage()) << "\n" << XERCES_STD_QUALIFIER endl; \
errorOccurred = true; \
} \
catch (const DOMException& toCatch) \
{ \
- cerr << "\nDOM Error during parsing: '" << xmlFile \
+ XERCES_STD_QUALIFIER cerr << "\nDOM Error during parsing: '" << xmlFile \
<< "\nDOMException code is: \n" \
- << toCatch.code << "\n" << endl; \
+ << toCatch.code << "\n" << XERCES_STD_QUALIFIER endl; \
errorOccurred = true; \
} \
catch (...) \
{ \
- cerr << "\nUnexpected exception during parsing: '" \
+ XERCES_STD_QUALIFIER cerr << "\nUnexpected exception during parsing: '" \
<< xmlFile << "'\n"; \
errorOccurred = true; \
} \
\
if (errorHandler.getSawErrors()) \
{ \
- cout << "\nErrors occurred, no output available\n" << endl;\
+ XERCES_STD_QUALIFIER cout << "\nErrors occurred, no output available\n" << XERCES_STD_QUALIFIER endl;\
errorOccurred = true; \
} \
\
@@ -261,7 +266,7 @@
// ---------------------------------------------------------------------------
void usage()
{
- cout << "\nUsage:\n"
+ XERCES_STD_QUALIFIER cout << "\nUsage:\n"
" InitTermTest [options] <XML file>\n\n"
"This program tests the XMLPlatformUtils::Initialize()/Terminate()\n"
"pair by calling it a number of times.\n"
@@ -270,7 +275,7 @@
" -s Enable schema processing. Default is off.\n"
" -f Enable full schema constraint checking. Defaults to off.\n"
" -? Show this help.\n"
- << endl;
+ << XERCES_STD_QUALIFIER endl;
}
// ---------------------------------------------------------------------------
@@ -333,8 +338,8 @@
}
else
{
- cerr << "Unknown option '" << argV[parmInd]
- << "', ignoring it.\n" << endl;
+ XERCES_STD_QUALIFIER cerr << "Unknown option '" << argV[parmInd]
+ << "', ignoring it.\n" << XERCES_STD_QUALIFIER endl;
}
}
@@ -357,7 +362,7 @@
unsigned int i = 0;
for (i=0; i < 100; i++) {
if (error) {
- cout << "Test Failed" << endl;
+ XERCES_STD_QUALIFIER cout << "Test Failed" << XERCES_STD_QUALIFIER endl;
return 4;
}
@@ -403,11 +408,11 @@
error = true;
if (error) {
- cout << "Test Failed" << endl;
+ XERCES_STD_QUALIFIER cout << "Test Failed" << XERCES_STD_QUALIFIER endl;
return 4;
}
- cout << "Test Run Successfully" << endl;
+ XERCES_STD_QUALIFIER cout << "Test Run Successfully" << XERCES_STD_QUALIFIER endl;
return 0;
}
@@ -427,27 +432,27 @@
void InitTermTestErrorHandler::error(const SAXParseException& e)
{
fSawErrors = true;
- cerr << "\nError at file " << StrX(e.getSystemId())
+ XERCES_STD_QUALIFIER cerr << "\nError at file " << StrX(e.getSystemId())
<< ", line " << e.getLineNumber()
<< ", char " << e.getColumnNumber()
- << "\n Message: " << StrX(e.getMessage()) << endl;
+ << "\n Message: " << StrX(e.getMessage()) << XERCES_STD_QUALIFIER endl;
}
void InitTermTestErrorHandler::fatalError(const SAXParseException& e)
{
fSawErrors = true;
- cerr << "\nFatal Error at file " << StrX(e.getSystemId())
+ XERCES_STD_QUALIFIER cerr << "\nFatal Error at file " << StrX(e.getSystemId())
<< ", line " << e.getLineNumber()
<< ", char " << e.getColumnNumber()
- << "\n Message: " << StrX(e.getMessage()) << endl;
+ << "\n Message: " << StrX(e.getMessage()) << XERCES_STD_QUALIFIER endl;
}
void InitTermTestErrorHandler::warning(const SAXParseException& e)
{
- cerr << "\nWarning at file " << StrX(e.getSystemId())
+ XERCES_STD_QUALIFIER cerr << "\nWarning at file " << StrX(e.getSystemId())
<< ", line " << e.getLineNumber()
<< ", char " << e.getColumnNumber()
- << "\n Message: " << StrX(e.getMessage()) << endl;
+ << "\n Message: " << StrX(e.getMessage()) << XERCES_STD_QUALIFIER endl;
}
void InitTermTestErrorHandler::resetErrors()
1.7 +8 -2 xml-xerces/c/tests/InitTermTest/InitTermTest.hpp
Index: InitTermTest.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/InitTermTest/InitTermTest.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- InitTermTest.hpp 5 Feb 2003 18:55:21 -0000 1.6
+++ InitTermTest.hpp 30 May 2003 13:08:25 -0000 1.7
@@ -62,7 +62,13 @@
// Includes
// ---------------------------------------------------------------------------
#include <xercesc/sax/ErrorHandler.hpp>
+#include <xercesc/util/PlatformUtils.hpp>
+
+#if defined(XERCES_NEW_IOSTREAMS)
+#include <iostream>
+#else
#include <iostream.h>
+#endif
XERCES_CPP_NAMESPACE_USE
@@ -159,7 +165,7 @@
char* fLocalForm;
};
-inline ostream& operator<<(ostream& target, const StrX& toDump)
+inline XERCES_STD_QUALIFIER ostream& operator<<(XERCES_STD_QUALIFIER ostream& target, const StrX& toDump)
{
target << toDump.localForm();
return target;
1.12 +9 -6 xml-xerces/c/tests/ParserTest/ParserTest.cpp
Index: ParserTest.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/ParserTest/ParserTest.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ParserTest.cpp 1 Feb 2002 22:45:54 -0000 1.11
+++ ParserTest.cpp 30 May 2003 13:08:25 -0000 1.12
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.12 2003/05/30 13:08:25 gareth
+ * move over to macros for std:: and iostream/iostream.h issues.
+ *
* Revision 1.11 2002/02/01 22:45:54 peiyongz
* sane_include
*
@@ -118,8 +121,8 @@
catch(const XMLException& toCatch)
{
- cout << "Error during platform init! Message:\n"
- << StrX(toCatch.getMessage()) << endl;
+ XERCES_STD_QUALIFIER cout << "Error during platform init! Message:\n"
+ << StrX(toCatch.getMessage()) << XERCES_STD_QUALIFIER endl;
return 1;
}
@@ -162,13 +165,13 @@
else if (!XMLString::compareNIString(argV[index], "/URL=", 5))
urlPath = XMLString::transcode(&argV[index][5]);
else
- cout << "Unknown parameter: " << argV[index] << endl;
+ XERCES_STD_QUALIFIER cout << "Unknown parameter: " << argV[index] << XERCES_STD_QUALIFIER endl;
}
// We have to have a URL to work on
if (!urlPath)
{
- cout << "A URL must be provided, /URL=xxxx" << endl;
+ XERCES_STD_QUALIFIER cout << "A URL must be provided, /URL=xxxx" << XERCES_STD_QUALIFIER endl;
return 1;
}
@@ -208,9 +211,9 @@
catch(const XMLException& toCatch)
{
- cout << "Exception during scan:\n "
+ XERCES_STD_QUALIFIER cout << "Exception during scan:\n "
<< StrX(toCatch.getMessage())
- << endl;
+ << XERCES_STD_QUALIFIER endl;
}
// And call the termination method
1.8 +10 -1 xml-xerces/c/tests/ParserTest/ParserTest.hpp
Index: ParserTest.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/ParserTest/ParserTest.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ParserTest.hpp 5 Feb 2003 18:55:21 -0000 1.7
+++ ParserTest.hpp 30 May 2003 13:08:26 -0000 1.8
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.8 2003/05/30 13:08:26 gareth
+ * move over to macros for std:: and iostream/iostream.h issues.
+ *
* Revision 1.7 2003/02/05 18:55:21 tng
* [Bug 11915] Utility for freeing memory.
*
@@ -101,7 +104,13 @@
// ---------------------------------------------------------------------------
#include "ParserTest_Parser.hpp"
#include <stdlib.h>
+#include <xercesc/util/PlatformUtils.hpp>
+
+#if defined(XERCES_NEW_IOSTREAMS)
+#include <iostream>
+#else
#include <iostream.h>
+#endif
// ---------------------------------------------------------------------------
@@ -153,7 +162,7 @@
char* fLocalForm;
};
-inline ostream& operator<<(ostream& target, const StrX& toDump)
+inline XERCES_STD_QUALIFIER ostream& operator<<(XERCES_STD_QUALIFIER ostream& target, const StrX& toDump)
{
target << toDump.localForm();
return target;
1.11 +163 -160 xml-xerces/c/tests/ParserTest/ParserTest_Parser.cpp
Index: ParserTest_Parser.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/ParserTest/ParserTest_Parser.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ParserTest_Parser.cpp 1 Feb 2002 22:45:54 -0000 1.10
+++ ParserTest_Parser.cpp 30 May 2003 13:08:26 -0000 1.11
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.11 2003/05/30 13:08:26 gareth
+ * move over to macros for std:: and iostream/iostream.h issues.
+ *
* Revision 1.10 2002/02/01 22:45:54 peiyongz
* sane_include
*
@@ -159,12 +162,12 @@
{
if (fOutputType == OutputType_Debug)
{
- cout << "Got CHARS:\n Bytes: "
+ XERCES_STD_QUALIFIER cout << "Got CHARS:\n Bytes: "
<< length << ", CDATA?: "
<< (cdataSection ? "Yes" : "No")
<< "\n"
<< " SrcOfs: " << fScanner->getSrcOffset()
- << "\n" << endl;
+ << "\n" << XERCES_STD_QUALIFIER endl;
}
else if ((fOutputType == OutputType_JCCanon)
|| (fOutputType == OutputType_SunCanon))
@@ -174,10 +177,10 @@
else if (fOutputType == OutputType_XML)
{
if (cdataSection)
- cout << "<![CDATA[";
+ XERCES_STD_QUALIFIER cout << "<![CDATA[";
showChars(chars, length);
if (cdataSection)
- cout << "]]>";
+ XERCES_STD_QUALIFIER cout << "]]>";
}
}
@@ -185,16 +188,16 @@
{
if (fOutputType == OutputType_Debug)
{
- cout << "Got document COMMENT:\n "
+ XERCES_STD_QUALIFIER cout << "Got document COMMENT:\n "
<< "Text: \"" << StrX(comment) << "\"\n"
<< " SrcOfs: " << fScanner->getSrcOffset()
- << "\n" << endl;
+ << "\n" << XERCES_STD_QUALIFIER endl;
}
else if (fOutputType == OutputType_XML)
{
- cout << "<!--";
+ XERCES_STD_QUALIFIER cout << "<!--";
showString(comment);
- cout << "-->";
+ XERCES_STD_QUALIFIER cout << "-->";
}
}
@@ -203,25 +206,25 @@
{
if (fOutputType == OutputType_Debug)
{
- cout << "Got document PI:\n "
+ XERCES_STD_QUALIFIER cout << "Got document PI:\n "
<< "Target: \"" << target << '"';
if (XMLString::stringLen(data))
- cout << ", Data: \"" << StrX(data) << "\"\n";
+ XERCES_STD_QUALIFIER cout << ", Data: \"" << StrX(data) << "\"\n";
- cout << " SrcOfs: " << fScanner->getSrcOffset()
- << "\n" << endl;
+ XERCES_STD_QUALIFIER cout << " SrcOfs: " << fScanner->getSrcOffset()
+ << "\n" << XERCES_STD_QUALIFIER endl;
}
else if ((fOutputType == OutputType_XML)
|| (fOutputType == OutputType_JCCanon)
|| (fOutputType == OutputType_SunCanon))
{
- cout << "<?";
+ XERCES_STD_QUALIFIER cout << "<?";
showString(target);
- cout << " ";
+ XERCES_STD_QUALIFIER cout << " ";
if (XMLString::stringLen(data))
- cout << StrX(data);
- cout << "?>";
+ XERCES_STD_QUALIFIER cout << StrX(data);
+ XERCES_STD_QUALIFIER cout << "?>";
}
}
@@ -230,13 +233,13 @@
{
if (fOutputType == OutputType_Debug)
{
- cout << "Got ENDDOCUMENT:\n"
+ XERCES_STD_QUALIFIER cout << "Got ENDDOCUMENT:\n"
<< " SrcOfs: " << fScanner->getSrcOffset()
- << "\n" << endl;
+ << "\n" << XERCES_STD_QUALIFIER endl;
}
else if (fOutputType == OutputType_SunCanon)
{
- cout << "\r\n";
+ XERCES_STD_QUALIFIER cout << "\r\n";
}
}
@@ -251,27 +254,27 @@
XMLBuffer bufURI;
fScanner->getURIText(uriId, bufURI);
- cout << "Got ENDELEMENT:\n Name: "
+ XERCES_STD_QUALIFIER cout << "Got ENDELEMENT:\n Name: "
<< "{" << StrX(bufURI.getRawBuffer()) << "}"
<< StrX(elemDecl.getBaseName())
- << endl;
+ << XERCES_STD_QUALIFIER endl;
}
else
{
- cout << "Got ENDELEMENT:\n Name: "
- << StrX(elemDecl.getFullName()) << endl;
+ XERCES_STD_QUALIFIER cout << "Got ENDELEMENT:\n Name: "
+ << StrX(elemDecl.getFullName()) << XERCES_STD_QUALIFIER endl;
}
- cout << " SrcOfs: " << fScanner->getSrcOffset()
- << "\n" << endl;
+ XERCES_STD_QUALIFIER cout << " SrcOfs: " << fScanner->getSrcOffset()
+ << "\n" << XERCES_STD_QUALIFIER endl;
}
else if ((fOutputType == OutputType_XML)
|| (fOutputType == OutputType_JCCanon)
|| (fOutputType == OutputType_SunCanon))
{
- cout << "</";
+ XERCES_STD_QUALIFIER cout << "</";
showString(elemDecl.getFullName());
- cout << ">";
+ XERCES_STD_QUALIFIER cout << ">";
}
// Clear the flag that says we're now inside the root
@@ -283,8 +286,8 @@
{
if (fOutputType == OutputType_Debug)
{
- cout << "Got ENDENTITYREF:\n "
- << "Name: " << StrX(entDecl.getName()) << "\n" << endl;
+ XERCES_STD_QUALIFIER cout << "Got ENDENTITYREF:\n "
+ << "Name: " << StrX(entDecl.getName()) << "\n" << XERCES_STD_QUALIFIER endl;
}
}
@@ -294,20 +297,20 @@
{
if (fOutputType == OutputType_Debug)
{
- cout << "Got WHITESPACE:\n Bytes: "
+ XERCES_STD_QUALIFIER cout << "Got WHITESPACE:\n Bytes: "
<< length << ", CDATA?: "
<< (cdataSection ? "Yes" : "No")
<< "\n"
<< " SrcOfs: " << fScanner->getSrcOffset()
- << "\n" << endl;
+ << "\n" << XERCES_STD_QUALIFIER endl;
}
else if (fOutputType == OutputType_XML)
{
if (cdataSection)
- cout << "<![CDATA[";
+ XERCES_STD_QUALIFIER cout << "<![CDATA[";
showChars(chars, length);
if (cdataSection)
- cout << "]]>";
+ XERCES_STD_QUALIFIER cout << "]]>";
}
else if ((fOutputType == OutputType_JCCanon)
|| (fOutputType == OutputType_SunCanon))
@@ -321,13 +324,13 @@
void TestParser::resetDocument()
{
if (fOutputType == OutputType_Debug)
- cout << "Got RESETDOCUMENT:\n" << endl;
+ XERCES_STD_QUALIFIER cout << "Got RESETDOCUMENT:\n" << XERCES_STD_QUALIFIER endl;
}
void TestParser::startDocument()
{
if (fOutputType == OutputType_Debug)
- cout << "Got STARTDOCUMENT:\n" << endl;
+ XERCES_STD_QUALIFIER cout << "Got STARTDOCUMENT:\n" << XERCES_STD_QUALIFIER endl;
}
void
@@ -349,7 +352,7 @@
if (fDoNamespaces)
{
fScanner->getURIText(uriId, bufURI);
- cout << "Got STARTELEMENT:\n "
+ XERCES_STD_QUALIFIER cout << "Got STARTELEMENT:\n "
<< " Name: {" << StrX(bufURI.getRawBuffer()) << "}"
<< StrX(elemDecl.getBaseName())
<< ", AttCount: " << attCount
@@ -359,7 +362,7 @@
}
else
{
- cout << "Got STARTELEMENT:\n Name: "
+ XERCES_STD_QUALIFIER cout << "Got STARTELEMENT:\n Name: "
<< StrX(elemDecl.getFullName())
<< ", AttCount: " << attCount
<< ", Empty?: "
@@ -367,12 +370,12 @@
<< "\n";
}
- cout << " SrcOfs: " << fScanner->getSrcOffset() << "\n";
+ XERCES_STD_QUALIFIER cout << " SrcOfs: " << fScanner->getSrcOffset() << "\n";
// If any attributes, then show them
if (attCount)
{
- cout << " Attrs: ";
+ XERCES_STD_QUALIFIER cout << " Attrs: ";
for (unsigned int attInd = 0; attInd < attCount; attInd++)
{
const XMLAttr* curAttr = attrList.elementAt(attInd);
@@ -380,62 +383,62 @@
if (fDoNamespaces)
{
fScanner->getURIText(curAttr->getURIId(), bufURI);
- cout << "Name=" << "{" << StrX(bufURI.getRawBuffer())
+ XERCES_STD_QUALIFIER cout << "Name=" << "{" << StrX(bufURI.getRawBuffer())
<< "}" << StrX(curAttr->getName());
}
else
{
- cout << "Name=" << StrX(curAttr->getQName());
+ XERCES_STD_QUALIFIER cout << "Name=" << StrX(curAttr->getQName());
}
if (curAttr->getSpecified())
- cout << " (Explicit) ";
+ XERCES_STD_QUALIFIER cout << " (Explicit) ";
else
- cout << " (Defaulted) ";
+ XERCES_STD_QUALIFIER cout << " (Defaulted) ";
- cout << "Value=" << StrX(curAttr->getValue()) << "\n"
+ XERCES_STD_QUALIFIER cout << "Value=" << StrX(curAttr->getValue()) << "\n"
<< " ";
}
}
- cout << endl;
+ XERCES_STD_QUALIFIER cout << XERCES_STD_QUALIFIER endl;
}
else if (fOutputType == OutputType_XML)
{
- cout << "<";
+ XERCES_STD_QUALIFIER cout << "<";
showString(elemDecl.getFullName());
if (attCount)
{
- cout << " ";
+ XERCES_STD_QUALIFIER cout << " ";
for (unsigned int index = 0; index < attCount; index++)
{
const XMLAttr* curAttr = attrList.elementAt(index);
showString(curAttr->getQName());
- cout << "=\"";
+ XERCES_STD_QUALIFIER cout << "=\"";
showString(curAttr->getValue());
- cout << "\"";
+ XERCES_STD_QUALIFIER cout << "\"";
if (index < attCount-1)
- cout << " ";
+ XERCES_STD_QUALIFIER cout << " ";
}
}
if (isEmpty)
- cout << "/>";
+ XERCES_STD_QUALIFIER cout << "/>";
else
- cout << ">";
+ XERCES_STD_QUALIFIER cout << ">";
}
else if ((fOutputType == OutputType_JCCanon)
|| (fOutputType == OutputType_SunCanon))
{
- cout << "<";
+ XERCES_STD_QUALIFIER cout << "<";
showString(elemDecl.getFullName());
if (attCount)
{
- cout << " ";
+ XERCES_STD_QUALIFIER cout << " ";
//
// Get a list of attribute pointers. The canonical output
@@ -455,25 +458,25 @@
{
const XMLAttr* curAttr = attrTmp[index];
showString(curAttr->getQName());
- cout << "=\"";
+ XERCES_STD_QUALIFIER cout << "=\"";
showString(curAttr->getValue());
- cout << "\"";
+ XERCES_STD_QUALIFIER cout << "\"";
if (index < attCount-1)
- cout << " ";
+ XERCES_STD_QUALIFIER cout << " ";
}
delete [] attrTmp;
}
if (isEmpty)
{
- cout << "></";
+ XERCES_STD_QUALIFIER cout << "></";
showString(elemDecl.getFullName());
- cout << ">";
+ XERCES_STD_QUALIFIER cout << ">";
}
else
{
- cout << ">";
+ XERCES_STD_QUALIFIER cout << ">";
}
}
}
@@ -482,8 +485,8 @@
{
if (fOutputType == OutputType_Debug)
{
- cout << "Got STARTENTITY:\n "
- << "Name: " << StrX(entDecl.getName()) << "\n" << endl;
+ XERCES_STD_QUALIFIER cout << "Got STARTENTITY:\n "
+ << "Name: " << StrX(entDecl.getName()) << "\n" << XERCES_STD_QUALIFIER endl;
}
}
@@ -494,29 +497,29 @@
{
if (fOutputType == OutputType_Debug)
{
- cout << "Got XMLDECL:\n "
+ XERCES_STD_QUALIFIER cout << "Got XMLDECL:\n "
<< "Version:\"" << StrX(versionStr) << "\""
<< " Encoding:\"" << StrX(encodingStr) << "\""
<< " Standalone:\"" << StrX(standaloneStr) << "\""
<< " Auto Encoding:\"" << StrX(autoEncStr) << "\""
<< "\n"
<< " SrcOfs: " << fScanner->getSrcOffset()
- << "\n" << endl;
+ << "\n" << XERCES_STD_QUALIFIER endl;
}
else if (fOutputType == OutputType_XML)
{
- cout << "<?xml";
+ XERCES_STD_QUALIFIER cout << "<?xml";
if (XMLString::stringLen(versionStr))
- cout << " version=\"" << StrX(versionStr) << '"';
+ XERCES_STD_QUALIFIER cout << " version=\"" << StrX(versionStr) << '"';
if (XMLString::stringLen(encodingStr))
- cout << " encoding=\"" << StrX(encodingStr) << '"';
+ XERCES_STD_QUALIFIER cout << " encoding=\"" << StrX(encodingStr) << '"';
if (XMLString::stringLen(standaloneStr))
- cout << " standlone=\"" << StrX(standaloneStr) << '"';
+ XERCES_STD_QUALIFIER cout << " standlone=\"" << StrX(standaloneStr) << '"';
- cout << " ?>";
+ XERCES_STD_QUALIFIER cout << " ?>";
}
}
@@ -530,7 +533,7 @@
{
if (fOutputType == OutputType_Debug)
{
- cout << "Got ATTDEF:\n "
+ XERCES_STD_QUALIFIER cout << "Got ATTDEF:\n "
<< "Name: " << StrX(attDef.getFullName())
<< ", Type: "
<< StrX(XMLAttDef::getAttTypeString(attDef.getType()))
@@ -538,10 +541,10 @@
<< StrX(XMLAttDef::getDefAttTypeString(attDef.getDefaultType()));
if (XMLString::stringLen(attDef.getValue()))
- cout << ", Value: \"" << StrX(attDef.getValue()) << '"';
+ XERCES_STD_QUALIFIER cout << ", Value: \"" << StrX(attDef.getValue()) << '"';
- cout << "\n SrcOfs: " << fScanner->getSrcOffset()
- << "\n" << endl;
+ XERCES_STD_QUALIFIER cout << "\n SrcOfs: " << fScanner->getSrcOffset()
+ << "\n" << XERCES_STD_QUALIFIER endl;
}
else if (fOutputType != OutputType_None)
{
@@ -550,36 +553,36 @@
if (fIntDTDOutput)
{
- cout << StrX(attDef.getFullName()) << " ";
+ XERCES_STD_QUALIFIER cout << StrX(attDef.getFullName()) << " ";
if (attDef.getType() == XMLAttDef::Enumeration)
{
- cout << '(';
+ XERCES_STD_QUALIFIER cout << '(';
StrX tmpStr(attDef.getEnumeration());
const char* curCh = tmpStr.localForm();
while (*curCh)
{
while (!isspace(*curCh) && *curCh)
- cout << *curCh++;
+ XERCES_STD_QUALIFIER cout << *curCh++;
if (*curCh)
{
- cout << '|';
+ XERCES_STD_QUALIFIER cout << '|';
curCh++;
}
}
- cout << ')';
+ XERCES_STD_QUALIFIER cout << ')';
}
else
{
- cout << StrX(XMLAttDef::getAttTypeString(attDef.getType()));
+ XERCES_STD_QUALIFIER cout << StrX(XMLAttDef::getAttTypeString(attDef.getType()));
}
if (XMLString::stringLen(attDef.getValue()))
- cout << " \"" << StrX(attDef.getValue()) << '"';
+ XERCES_STD_QUALIFIER cout << " \"" << StrX(attDef.getValue()) << '"';
if (attDef.getDefaultType() != XMLAttDef::Default)
{
- cout << " "
+ XERCES_STD_QUALIFIER cout << " "
<< StrX(XMLAttDef::getDefAttTypeString(attDef.getDefaultType()));
}
}
@@ -590,10 +593,10 @@
{
if (fOutputType == OutputType_Debug)
{
- cout << "Got DTD COMMENT:\n "
+ XERCES_STD_QUALIFIER cout << "Got DTD COMMENT:\n "
<< "Text: \"" << StrX(comment) << "\"\n"
<< " SrcOfs: " << fScanner->getSrcOffset()
- << "\n" << endl;
+ << "\n" << XERCES_STD_QUALIFIER endl;
}
else if (fOutputType != OutputType_None)
{
@@ -601,7 +604,7 @@
return;
if (fIntDTDOutput)
- cout << "<!--" << StrX(comment) << "-->";
+ XERCES_STD_QUALIFIER cout << "<!--" << StrX(comment) << "-->";
}
}
@@ -612,27 +615,27 @@
{
if (fOutputType == OutputType_Debug)
{
- cout << "Got DOCTYPE:\n "
+ XERCES_STD_QUALIFIER cout << "Got DOCTYPE:\n "
<< "Root: " << StrX(elemDecl.getFullName());
if (XMLString::stringLen(publicId))
- cout << ", PUBLIC: " << StrX(publicId);
+ XERCES_STD_QUALIFIER cout << ", PUBLIC: " << StrX(publicId);
if (XMLString::stringLen(systemId))
- cout << ", SYSTEM: " << StrX(systemId);
+ XERCES_STD_QUALIFIER cout << ", SYSTEM: " << StrX(systemId);
- cout << "\n SrcOfs: " << fScanner->getSrcOffset()
- << "\n" << endl;
+ XERCES_STD_QUALIFIER cout << "\n SrcOfs: " << fScanner->getSrcOffset()
+ << "\n" << XERCES_STD_QUALIFIER endl;
}
else if (fOutputType != OutputType_None)
{
if (fIntDTDOutput)
{
- cout << "<!DOCTYPE " << StrX(elemDecl.getFullName());
+ XERCES_STD_QUALIFIER cout << "<!DOCTYPE " << StrX(elemDecl.getFullName());
showIds(publicId, systemId);
if (!hasIntSubset)
- cout << ">";
+ XERCES_STD_QUALIFIER cout << ">";
}
}
}
@@ -642,14 +645,14 @@
{
if (fOutputType == OutputType_Debug)
{
- cout << "Got DTD PI:\n "
+ XERCES_STD_QUALIFIER cout << "Got DTD PI:\n "
<< "Target: \"" << StrX(target) << '"';
if (XMLString::stringLen(data))
- cout << ", Data: \"" << StrX(data) << '"';
+ XERCES_STD_QUALIFIER cout << ", Data: \"" << StrX(data) << '"';
- cout << " SrcOfs: " << fScanner->getSrcOffset()
- << "\n" << endl;
+ XERCES_STD_QUALIFIER cout << " SrcOfs: " << fScanner->getSrcOffset()
+ << "\n" << XERCES_STD_QUALIFIER endl;
}
else if (fOutputType != OutputType_None)
{
@@ -658,10 +661,10 @@
if (fIntDTDOutput)
{
- cout << "<?" << target;
+ XERCES_STD_QUALIFIER cout << "<?" << target;
if (XMLString::stringLen(data))
- cout << " " << StrX(data);
- cout << "?>";
+ XERCES_STD_QUALIFIER cout << " " << StrX(data);
+ XERCES_STD_QUALIFIER cout << "?>";
}
}
}
@@ -671,10 +674,10 @@
{
if (fOutputType == OutputType_Debug)
{
- cout << "Got DTD Spaces:\n Bytes: "
+ XERCES_STD_QUALIFIER cout << "Got DTD Spaces:\n Bytes: "
<< length << "\n"
<< " SrcOfs: " << fScanner->getSrcOffset()
- << "\n" << endl;
+ << "\n" << XERCES_STD_QUALIFIER endl;
}
else if (fOutputType != OutputType_None)
{
@@ -691,16 +694,16 @@
{
if (fOutputType == OutputType_Debug)
{
- cout << "Got ELEMENT DECL:\n "
+ XERCES_STD_QUALIFIER cout << "Got ELEMENT DECL:\n "
<< "Name: " << StrX(decl.getFullName());
if (isIgnored)
- cout << " (Ignored)";
+ XERCES_STD_QUALIFIER cout << " (Ignored)";
- cout << ", Content: "
+ XERCES_STD_QUALIFIER cout << ", Content: "
<< StrX(decl.getFormattedContentModel())
<< "\n SrcOfs: " << fScanner->getSrcOffset()
- << "\n" << endl;
+ << "\n" << XERCES_STD_QUALIFIER endl;
}
else if (fOutputType != OutputType_None)
{
@@ -709,7 +712,7 @@
if (fIntDTDOutput)
{
- cout << "<!ELEMENT " << StrX(decl.getFullName()) << " "
+ XERCES_STD_QUALIFIER cout << "<!ELEMENT " << StrX(decl.getFullName()) << " "
<< StrX(decl.getFormattedContentModel())
<< ">";
}
@@ -720,10 +723,10 @@
{
if (fOutputType == OutputType_Debug)
{
- cout << "Got ENDATTLIST:\n "
+ XERCES_STD_QUALIFIER cout << "Got ENDATTLIST:\n "
<< "Name: " << StrX(elemDecl.getFullName()) << "\n"
<< " SrcOfs: " << fScanner->getSrcOffset()
- << "\n" << endl;
+ << "\n" << XERCES_STD_QUALIFIER endl;
}
else if (fOutputType != OutputType_None)
{
@@ -731,7 +734,7 @@
return;
if (fIntDTDOutput)
- cout << ">";
+ XERCES_STD_QUALIFIER cout << ">";
}
}
@@ -739,14 +742,14 @@
{
if (fOutputType == OutputType_Debug)
{
- cout << "Got ENDINTSUBSET\n"
+ XERCES_STD_QUALIFIER cout << "Got ENDINTSUBSET\n"
<< " SrcOfs: " << fScanner->getSrcOffset()
- << "\n" << endl;
+ << "\n" << XERCES_STD_QUALIFIER endl;
}
else if (fOutputType != OutputType_None)
{
if (fIntDTDOutput)
- cout << "]>";
+ XERCES_STD_QUALIFIER cout << "]>";
}
}
@@ -754,7 +757,7 @@
{
fInExtSubset = false;
if (fOutputType == OutputType_Debug)
- cout << "Got ENDEXTSUBSET\n" << endl;
+ XERCES_STD_QUALIFIER cout << "Got ENDEXTSUBSET\n" << XERCES_STD_QUALIFIER endl;
}
void TestParser::entityDecl(const DTDEntityDecl& entityDecl
@@ -763,10 +766,10 @@
{
if (fOutputType == OutputType_Debug)
{
- cout << "Got ENTITYDECL:\n "
+ XERCES_STD_QUALIFIER cout << "Got ENTITYDECL:\n "
<< "Name: " << StrX(entityDecl.getName())
<< (isPEDecl ? " [Parameter Entity]" : " [General Entity]")
- << "\n" << endl;
+ << "\n" << XERCES_STD_QUALIFIER endl;
}
else if (fOutputType != OutputType_None)
{
@@ -775,17 +778,17 @@
if (fIntDTDOutput)
{
- cout << "<!ENTITY ";
+ XERCES_STD_QUALIFIER cout << "<!ENTITY ";
if (isPEDecl)
- cout << "% ";
- cout << StrX(entityDecl.getName());
+ XERCES_STD_QUALIFIER cout << "% ";
+ XERCES_STD_QUALIFIER cout << StrX(entityDecl.getName());
if (entityDecl.isExternal())
showIds(entityDecl.getPublicId(), entityDecl.getSystemId());
else
- cout << " \"" << StrX(entityDecl.getValue()) << "\"";
+ XERCES_STD_QUALIFIER cout << " \"" << StrX(entityDecl.getValue()) << "\"";
- cout << ">";
+ XERCES_STD_QUALIFIER cout << ">";
}
}
}
@@ -793,7 +796,7 @@
void TestParser::resetDocType()
{
if (fOutputType == OutputType_Debug)
- cout << "Got RESETDOCTYPE:\n" << endl;
+ XERCES_STD_QUALIFIER cout << "Got RESETDOCTYPE:\n" << XERCES_STD_QUALIFIER endl;
}
void TestParser::notationDecl( const XMLNotationDecl& notDecl
@@ -801,9 +804,9 @@
{
if (fOutputType == OutputType_Debug)
{
- cout << "Got NOTATIONDECL:\n "
+ XERCES_STD_QUALIFIER cout << "Got NOTATIONDECL:\n "
<< "Name: " << StrX(notDecl.getName())
- << endl;
+ << XERCES_STD_QUALIFIER endl;
}
else if (fOutputType != OutputType_None)
{
@@ -812,20 +815,20 @@
if (fIntDTDOutput)
{
- cout << "<!NOTATION " << StrX(notDecl.getName()) << " ";
+ XERCES_STD_QUALIFIER cout << "<!NOTATION " << StrX(notDecl.getName()) << " ";
if (!XMLString::stringLen(notDecl.getSystemId()))
- cout << "PUBLIC ";
+ XERCES_STD_QUALIFIER cout << "PUBLIC ";
else
- cout << "SYSTEM ";
+ XERCES_STD_QUALIFIER cout << "SYSTEM ";
if (XMLString::stringLen(notDecl.getPublicId()))
- cout << "\"" << StrX(notDecl.getPublicId()) << '"';
+ XERCES_STD_QUALIFIER cout << "\"" << StrX(notDecl.getPublicId()) << '"';
if (XMLString::stringLen(notDecl.getSystemId()))
- cout << " \"" << StrX(notDecl.getSystemId()) << '"';
+ XERCES_STD_QUALIFIER cout << " \"" << StrX(notDecl.getSystemId()) << '"';
- cout << ">";
+ XERCES_STD_QUALIFIER cout << ">";
}
}
}
@@ -834,9 +837,9 @@
{
if (fOutputType == OutputType_Debug)
{
- cout << "Got STARTATTLIST:\n "
+ XERCES_STD_QUALIFIER cout << "Got STARTATTLIST:\n "
<< "Name: " << StrX(elemDecl.getFullName())
- << "\n" << endl;
+ << "\n" << XERCES_STD_QUALIFIER endl;
}
else if (fOutputType != OutputType_None)
{
@@ -844,7 +847,7 @@
return;
if (fIntDTDOutput)
- cout << "<!ATTLIST " << StrX(elemDecl.getFullName());
+ XERCES_STD_QUALIFIER cout << "<!ATTLIST " << StrX(elemDecl.getFullName());
}
}
@@ -852,12 +855,12 @@
{
if (fOutputType == OutputType_Debug)
{
- cout << "Got STARTINTSUBSET\n" << endl;
+ XERCES_STD_QUALIFIER cout << "Got STARTINTSUBSET\n" << XERCES_STD_QUALIFIER endl;
}
else if (fOutputType != OutputType_None)
{
if (fIntDTDOutput)
- cout << " [";
+ XERCES_STD_QUALIFIER cout << " [";
}
}
@@ -865,7 +868,7 @@
{
fInExtSubset = true;
if (fOutputType == OutputType_Debug)
- cout << "Got STARTEXTSUBSET\n" << endl;
+ XERCES_STD_QUALIFIER cout << "Got STARTEXTSUBSET\n" << XERCES_STD_QUALIFIER endl;
}
void TestParser::TextDecl( const XMLCh* const versionStr
@@ -873,15 +876,15 @@
{
if (fOutputType == OutputType_Debug)
{
- cout << "Got TEXTDECL:\n ";
+ XERCES_STD_QUALIFIER cout << "Got TEXTDECL:\n ";
if (XMLString::stringLen(versionStr))
- cout << "Version: " << StrX(versionStr);
+ XERCES_STD_QUALIFIER cout << "Version: " << StrX(versionStr);
if (XMLString::stringLen(encodingStr))
- cout << "Encoding: " << StrX(encodingStr);
+ XERCES_STD_QUALIFIER cout << "Encoding: " << StrX(encodingStr);
- cout << "\n" << endl;
+ XERCES_STD_QUALIFIER cout << "\n" << XERCES_STD_QUALIFIER endl;
}
}
@@ -921,10 +924,10 @@
if (ofs != -1)
entName = &systemId[ofs + 1];
- cout << lineNum << "/" << colNum
+ XERCES_STD_QUALIFIER cout << lineNum << "/" << colNum
<< ":" << StrX(entName)
<< " - " << StrX(text)
- << endl;
+ << XERCES_STD_QUALIFIER endl;
return;
}
@@ -941,27 +944,27 @@
typeStr = "VALIDITY";
// Output the error heading and the error type string
- cout << "\nError: (" << typeStr;
+ XERCES_STD_QUALIFIER cout << "\nError: (" << typeStr;
// If we have either id, display them
if (XMLString::stringLen(systemId))
- cout << ", System Id: " << StrX(systemId);
+ XERCES_STD_QUALIFIER cout << ", System Id: " << StrX(systemId);
if (XMLString::stringLen(publicId))
- cout << ", Public Id: " << StrX(publicId);
+ XERCES_STD_QUALIFIER cout << ", Public Id: " << StrX(publicId);
// Display the position information
- cout << ", Line/Col: " << lineNum << "/" << colNum
+ XERCES_STD_QUALIFIER cout << ", Line/Col: " << lineNum << "/" << colNum
<< ")\n";
// And finally the error text
- cout << StrX(text) << endl;
+ XERCES_STD_QUALIFIER cout << StrX(text) << XERCES_STD_QUALIFIER endl;
}
void TestParser::resetErrors()
{
if (fOutputType == OutputType_Debug)
- cout << "Got RESETERRORS:\n" << endl;
+ XERCES_STD_QUALIFIER cout << "Got RESETERRORS:\n" << XERCES_STD_QUALIFIER endl;
}
@@ -993,7 +996,7 @@
{
if (index == length)
{
- cout << "Missing trailing surrogate\n" << endl;
+ XERCES_STD_QUALIFIER cout << "Missing trailing surrogate\n" << XERCES_STD_QUALIFIER endl;
break;
}
@@ -1054,27 +1057,27 @@
if (doCan)
{
if (toShow == chLF)
- cout << " ";
+ XERCES_STD_QUALIFIER cout << " ";
else if (toShow == chHTab)
- cout << "	";
+ XERCES_STD_QUALIFIER cout << "	";
else if (toShow == chCR)
- cout << " ";
+ XERCES_STD_QUALIFIER cout << " ";
else if (toShow == chSingleQuote)
- cout << "'";
+ XERCES_STD_QUALIFIER cout << "'";
else if (toShow == chAmpersand)
- cout << "&";
+ XERCES_STD_QUALIFIER cout << "&";
else if (toShow == chDoubleQuote)
- cout << """;
+ XERCES_STD_QUALIFIER cout << """;
else if (toShow == chOpenAngle)
- cout << "<";
+ XERCES_STD_QUALIFIER cout << "<";
else if (toShow == chCloseAngle)
- cout << ">";
+ XERCES_STD_QUALIFIER cout << ">";
else
- cout << toShow;
+ XERCES_STD_QUALIFIER cout << toShow;
}
else
{
- cout << toShow;
+ XERCES_STD_QUALIFIER cout << toShow;
}
}
@@ -1085,13 +1088,13 @@
{
if (!XMLString::stringLen(publicId))
{
- cout << " SYSTEM '" << StrX(systemId) << "'";
+ XERCES_STD_QUALIFIER cout << " SYSTEM '" << StrX(systemId) << "'";
}
else
{
- cout << " PUBLIC '" << StrX(publicId) << "'";
+ XERCES_STD_QUALIFIER cout << " PUBLIC '" << StrX(publicId) << "'";
if (systemId)
- cout << " '" << StrX(systemId) << "'";
+ XERCES_STD_QUALIFIER cout << " '" << StrX(systemId) << "'";
}
}
}
1.8 +8 -0 xml-xerces/c/tests/UtilTests/CoreTests.hpp
Index: CoreTests.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/UtilTests/CoreTests.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CoreTests.hpp 29 Jan 2003 20:14:49 -0000 1.7
+++ CoreTests.hpp 30 May 2003 13:08:26 -0000 1.8
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.8 2003/05/30 13:08:26 gareth
+ * move over to macros for std:: and iostream/iostream.h issues.
+ *
* Revision 1.7 2003/01/29 20:14:49 gareth
* updated for DOMTypeInfo tests.
*
@@ -87,8 +90,13 @@
#include <xercesc/util/XMLException.hpp>
#include <xercesc/util/XMLString.hpp>
#include <xercesc/util/XMLUni.hpp>
+#include <xercesc/util/PlatformUtils.hpp>
+#if defined(XERCES_NEW_IOSTREAMS)
+#include <iostream>
+#else
#include <iostream.h>
+#endif
XERCES_CPP_NAMESPACE_USE
1.6 +36 -33 xml-xerces/c/tests/UtilTests/CoreTestsMain.cpp
Index: CoreTestsMain.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/UtilTests/CoreTestsMain.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CoreTestsMain.cpp 1 Feb 2002 22:46:28 -0000 1.5
+++ CoreTestsMain.cpp 30 May 2003 13:08:26 -0000 1.6
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2003/05/30 13:08:26 gareth
+ * move over to macros for std:: and iostream/iostream.h issues.
+ *
* Revision 1.5 2002/02/01 22:46:28 peiyongz
* sane_include
*
@@ -115,13 +118,13 @@
catch(const XMLException& toCatch)
{
- std::wcout << L"Parser Init Failed!\n INFO: ("
+ XERCES_STD_QUALIFIER wcout << L"Parser Init Failed!\n INFO: ("
<< toCatch.getSrcFile() << L"." << toCatch.getSrcLine()
- << L") -" << toCatch.getMessage() << std::endl;
+ << L") -" << toCatch.getMessage() << XERCES_STD_QUALIFIER endl;
return 0xFFFF;
}
- std::wcout << L"\nXML4C2 Core Utilities Unit Tester\n" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"\nXML4C2 Core Utilities Unit Tester\n" << XERCES_STD_QUALIFIER endl;
// This value will return the number of failed tests
int retVal = 0;
@@ -134,10 +137,10 @@
// -------------------------------------------------------------------
if (!testTranscoders())
{
- std::wcout << L"Transcoder tests failed" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"Transcoder tests failed" << XERCES_STD_QUALIFIER endl;
retVal++;
}
- std::wcout << std::endl;
+ XERCES_STD_QUALIFIER wcout << XERCES_STD_QUALIFIER endl;
// -------------------------------------------------------------------
@@ -145,10 +148,10 @@
// -------------------------------------------------------------------
if (!testString())
{
- std::wcout << L"String tests failed" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"String tests failed" << XERCES_STD_QUALIFIER endl;
retVal++;
}
- std::wcout << std::endl;
+ XERCES_STD_QUALIFIER wcout << XERCES_STD_QUALIFIER endl;
// -------------------------------------------------------------------
@@ -156,10 +159,10 @@
// -------------------------------------------------------------------
if (!testCountedPointer())
{
- std::wcout << L"CountedPointerTo tests failed" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"CountedPointerTo tests failed" << XERCES_STD_QUALIFIER endl;
retVal++;
}
- std::wcout << std::endl;
+ XERCES_STD_QUALIFIER wcout << XERCES_STD_QUALIFIER endl;
// -------------------------------------------------------------------
@@ -167,10 +170,10 @@
// -------------------------------------------------------------------
if (!testURL())
{
- std::wcout << L"URL tests failed" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"URL tests failed" << XERCES_STD_QUALIFIER endl;
retVal++;
}
- std::wcout << std::endl;
+ XERCES_STD_QUALIFIER wcout << XERCES_STD_QUALIFIER endl;
// -------------------------------------------------------------------
@@ -178,10 +181,10 @@
// -------------------------------------------------------------------
if (!testValueVector())
{
- std::wcout << L"ValueVectorOf tests failed" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"ValueVectorOf tests failed" << XERCES_STD_QUALIFIER endl;
retVal++;
}
- std::wcout << std::endl;
+ XERCES_STD_QUALIFIER wcout << XERCES_STD_QUALIFIER endl;
// -------------------------------------------------------------------
@@ -189,10 +192,10 @@
// -------------------------------------------------------------------
if (!testValueArray())
{
- std::wcout << L"ValueArrayOf tests failed" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"ValueArrayOf tests failed" << XERCES_STD_QUALIFIER endl;
retVal++;
}
- std::wcout << std::endl;
+ XERCES_STD_QUALIFIER wcout << XERCES_STD_QUALIFIER endl;
// -------------------------------------------------------------------
@@ -200,10 +203,10 @@
// -------------------------------------------------------------------
if (!testValueStack())
{
- std::wcout << L"ValueStackOf tests failed" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"ValueStackOf tests failed" << XERCES_STD_QUALIFIER endl;
retVal++;
}
- std::wcout << std::endl;
+ XERCES_STD_QUALIFIER wcout << XERCES_STD_QUALIFIER endl;
// -------------------------------------------------------------------
@@ -211,10 +214,10 @@
// -------------------------------------------------------------------
if (!testRefArray())
{
- std::wcout << L"RefArrayOf tests failed" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"RefArrayOf tests failed" << XERCES_STD_QUALIFIER endl;
retVal++;
}
- std::wcout << std::endl;
+ XERCES_STD_QUALIFIER wcout << XERCES_STD_QUALIFIER endl;
// -------------------------------------------------------------------
@@ -222,10 +225,10 @@
// -------------------------------------------------------------------
if (!testRefStack())
{
- std::wcout << L"RefStackOf tests failed" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"RefStackOf tests failed" << XERCES_STD_QUALIFIER endl;
retVal++;
}
- std::wcout << std::endl;
+ XERCES_STD_QUALIFIER wcout << XERCES_STD_QUALIFIER endl;
// -------------------------------------------------------------------
@@ -233,10 +236,10 @@
// -------------------------------------------------------------------
if (!testRefVector())
{
- std::wcout << L"RefVectorOf tests failed" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"RefVectorOf tests failed" << XERCES_STD_QUALIFIER endl;
retVal++;
}
- std::wcout << std::endl;
+ XERCES_STD_QUALIFIER wcout << XERCES_STD_QUALIFIER endl;
// -------------------------------------------------------------------
@@ -244,10 +247,10 @@
// -------------------------------------------------------------------
if (!testRefHashTable())
{
- std::wcout << L"RefHashTableOf tests failed" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"RefHashTableOf tests failed" << XERCES_STD_QUALIFIER endl;
retVal++;
}
- std::wcout << std::endl;
+ XERCES_STD_QUALIFIER wcout << XERCES_STD_QUALIFIER endl;
// -------------------------------------------------------------------
@@ -255,28 +258,28 @@
// -------------------------------------------------------------------
if (!testBitSet())
{
- std::wcout << L"BitSet tests failed" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"BitSet tests failed" << XERCES_STD_QUALIFIER endl;
retVal++;
}
- std::wcout << std::endl;
+ XERCES_STD_QUALIFIER wcout << XERCES_STD_QUALIFIER endl;
}
catch(const XMLException& toCatch)
{
- std::wcout << L"Exception During Test!\n INFO: ("
+ XERCES_STD_QUALIFIER wcout << L"Exception During Test!\n INFO: ("
<< toCatch.getSrcFile() << L"."
<< toCatch.getSrcLine() << L") -"
- << toCatch.getMessage() << std::endl;
+ << toCatch.getMessage() << XERCES_STD_QUALIFIER endl;
return 0xFFFF;
}
// If we failed any tests, display a message
- std::wcout << L"--------------------------------\n";
+ XERCES_STD_QUALIFIER wcout << L"--------------------------------\n";
if (retVal == 0)
- std::wcout << L"<<PASSED>>: All tests passed\n";
+ XERCES_STD_QUALIFIER wcout << L"<<PASSED>>: All tests passed\n";
else
- std::wcout << L"<<FAILED>>: Some tests failed\n";
- std::wcout << L"--------------------------------\n" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"<<FAILED>>: Some tests failed\n";
+ XERCES_STD_QUALIFIER wcout << L"--------------------------------\n" << XERCES_STD_QUALIFIER endl;
return retVal;
}
1.6 +40 -37 xml-xerces/c/tests/UtilTests/CoreTests_BitSet.cpp
Index: CoreTests_BitSet.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/UtilTests/CoreTests_BitSet.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CoreTests_BitSet.cpp 1 Feb 2002 22:46:28 -0000 1.5
+++ CoreTests_BitSet.cpp 30 May 2003 13:08:26 -0000 1.6
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2003/05/30 13:08:26 gareth
+ * move over to macros for std:: and iostream/iostream.h issues.
+ *
* Revision 1.5 2002/02/01 22:46:28 peiyongz
* sane_include
*
@@ -100,8 +103,8 @@
if (setTest.size() != 32)
{
- std::wcout << L" Ctor did not create set of correct size"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" Ctor did not create set of correct size"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
@@ -115,8 +118,8 @@
{
if (setTest.get(index))
{
- std::wcout << L" A bit's initial value was not zero"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" A bit's initial value was not zero"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
}
@@ -124,8 +127,8 @@
// Make sure that allAreCleared() agrees
if (!setTest.allAreCleared())
{
- std::wcout << L" allAreCleared() disagrees with individual bit gets"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" allAreCleared() disagrees with individual bit gets"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
@@ -135,16 +138,16 @@
setTest.set(index);
if (!setTest.get(index))
{
- std::wcout << L" Bit was set but get returned false"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" Bit was set but get returned false"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
setTest.clear(index);
if (setTest.get(index))
{
- std::wcout << L" Bit was cleared but get returned true"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" Bit was cleared but get returned true"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
}
@@ -154,8 +157,8 @@
{
if (setTest.get(index))
{
- std::wcout << L" A bit remained set after clearing"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" A bit remained set after clearing"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
}
@@ -172,8 +175,8 @@
BitSet setTest2(setTest);
if (!setTest.equals(setTest2))
{
- std::wcout << L" Copy ctor did not create equal sets"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" Copy ctor did not create equal sets"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
@@ -183,8 +186,8 @@
{
if (setTest2.get(index))
{
- std::wcout << L" clearAll() did not clear all bits"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" clearAll() did not clear all bits"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
}
@@ -195,8 +198,8 @@
// Make sure it expanded
if (setTest2.size() != 64)
{
- std::wcout << L" Set of bit beyond size did not expand"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" Set of bit beyond size did not expand"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
@@ -207,8 +210,8 @@
// Make sure that allAreSet() sees them all set
if (!setTest.allAreSet())
{
- std::wcout << L" After setting all bits, allAreSet() returned false"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" After setting all bits, allAreSet() returned false"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
@@ -237,8 +240,8 @@
// They should be equal now
if (!setTest.equals(setTest2))
{
- std::wcout << L" OR of set with empty set did not create equal sets"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" OR of set with empty set did not create equal sets"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
@@ -246,8 +249,8 @@
setTest2.xorWith(setTest);
if (!setTest2.allAreCleared())
{
- std::wcout << L" XOR against original set did not get back original"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" XOR against original set did not get back original"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
@@ -255,7 +258,7 @@
setTest2.andWith(setTest);
if (!setTest2.allAreCleared())
{
- std::wcout << L" AND against empty set changed bits" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" AND against empty set changed bits" << XERCES_STD_QUALIFIER endl;
return false;
}
@@ -268,43 +271,43 @@
// ---------------------------------------------------------------------------
bool testBitSet()
{
- std::wcout << L"----------------------------------\n"
+ XERCES_STD_QUALIFIER wcout << L"----------------------------------\n"
<< L"Testing BitSet class\n"
- << L"----------------------------------" << std::endl;
+ << L"----------------------------------" << XERCES_STD_QUALIFIER endl;
bool retVal = true;
try
{
- std::wcout << L"Testing basic BitSet methods" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"Testing basic BitSet methods" << XERCES_STD_QUALIFIER endl;
if (!basicTests())
{
- std::wcout << L"Bitset basic test methods failed" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"Bitset basic test methods failed" << XERCES_STD_QUALIFIER endl;
retVal = false;
}
else
{
- std::wcout << L"Bitset basic tests passed" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"Bitset basic tests passed" << XERCES_STD_QUALIFIER endl;
}
- std::wcout << std::endl;
+ XERCES_STD_QUALIFIER wcout << XERCES_STD_QUALIFIER endl;
- std::wcout << L"Testing BitSet logical bit ops methods" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"Testing BitSet logical bit ops methods" << XERCES_STD_QUALIFIER endl;
if (!bitopsTests())
{
- std::wcout << L"Bitset logical bit ops failed" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"Bitset logical bit ops failed" << XERCES_STD_QUALIFIER endl;
retVal = false;
}
else
{
- std::wcout << L"Bitset logical bit ops passed" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"Bitset logical bit ops passed" << XERCES_STD_QUALIFIER endl;
}
- std::wcout << std::endl;
+ XERCES_STD_QUALIFIER wcout << XERCES_STD_QUALIFIER endl;
}
catch(const XMLException& toCatch)
{
- std::wcout << L" ERROR: Unexpected exception!\n Msg: "
- << toCatch.getMessage() << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" ERROR: Unexpected exception!\n Msg: "
+ << toCatch.getMessage() << XERCES_STD_QUALIFIER endl;
return false;
}
return retVal;
1.6 +7 -4 xml-xerces/c/tests/UtilTests/CoreTests_CountedPointer.cpp
Index: CoreTests_CountedPointer.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/UtilTests/CoreTests_CountedPointer.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CoreTests_CountedPointer.cpp 1 Feb 2002 22:46:28 -0000 1.5
+++ CoreTests_CountedPointer.cpp 30 May 2003 13:08:26 -0000 1.6
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2003/05/30 13:08:26 gareth
+ * move over to macros for std:: and iostream/iostream.h issues.
+ *
* Revision 1.5 2002/02/01 22:46:28 peiyongz
* sane_include
*
@@ -134,9 +137,9 @@
// ---------------------------------------------------------------------------
bool testCountedPointer()
{
- std::wcout << L"----------------------------------\n"
+ XERCES_STD_QUALIFIER wcout << L"----------------------------------\n"
<< L"Testing CountedPointerTo class\n"
- << L"----------------------------------" << std::endl;
+ << L"----------------------------------" << XERCES_STD_QUALIFIER endl;
bool retVal = true;
@@ -146,8 +149,8 @@
catch(const XMLException& toCatch)
{
- std::wcout << L" ERROR: Unexpected exception!\n Msg: "
- << toCatch.getMessage() << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" ERROR: Unexpected exception!\n Msg: "
+ << toCatch.getMessage() << XERCES_STD_QUALIFIER endl;
return false;
}
return retVal;
1.6 +34 -31 xml-xerces/c/tests/UtilTests/CoreTests_RefArray.cpp
Index: CoreTests_RefArray.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/UtilTests/CoreTests_RefArray.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CoreTests_RefArray.cpp 1 Feb 2002 22:46:28 -0000 1.5
+++ CoreTests_RefArray.cpp 30 May 2003 13:08:26 -0000 1.6
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2003/05/30 13:08:26 gareth
+ * move over to macros for std:: and iostream/iostream.h issues.
+ *
* Revision 1.5 2002/02/01 22:46:28 peiyongz
* sane_include
*
@@ -112,8 +115,8 @@
// Make sure that it has the right initial size
if (testArray1.length() != 255)
{
- std::wcout << L" The ctor created wrong length() value"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" The ctor created wrong length() value"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
@@ -122,16 +125,16 @@
if (testArray2.length() != 255)
{
- std::wcout << L" The copy ctor created wrong length() value"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" The copy ctor created wrong length() value"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
// Test the equality of the two arrays
if (testArray1 != testArray2)
{
- std::wcout << L" The copy ctor created unequal arrays"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" The copy ctor created unequal arrays"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
@@ -145,8 +148,8 @@
if (testArray3.length() != 16)
{
- std::wcout << L" The init values ctor created wrong length() value"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" The init values ctor created wrong length() value"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
@@ -155,8 +158,8 @@
{
if (*testArray3[index] != (double)index)
{
- std::wcout << L" The init values ctor did not init contents correctly"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" The init values ctor did not init contents correctly"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
}
@@ -170,8 +173,8 @@
if (testArray4 != testArray3)
{
- std::wcout << L" Assignment did not create equal arrays"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" Assignment did not create equal arrays"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
@@ -198,8 +201,8 @@
{
if (testArray1[index] != &testVals[index])
{
- std::wcout << L" Failed to read back values just set"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" Failed to read back values just set"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
}
@@ -218,7 +221,7 @@
if (!caughtIt)
{
- std::wcout << L" Failed to catch index error" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" Failed to catch index error" << XERCES_STD_QUALIFIER endl;
return false;
}
@@ -231,48 +234,48 @@
// ---------------------------------------------------------------------------
bool testRefArray()
{
- std::wcout << L"----------------------------------\n"
+ XERCES_STD_QUALIFIER wcout << L"----------------------------------\n"
<< L"Testing RefArrayOf template class\n"
- << L"----------------------------------" << std::endl;
+ << L"----------------------------------" << XERCES_STD_QUALIFIER endl;
bool retVal = true;
try
{
// Call other local methods to do specific tests
- std::wcout << L"Testing RefArrayOf contructors" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"Testing RefArrayOf contructors" << XERCES_STD_QUALIFIER endl;
if (!constructorTests())
{
- std::wcout << L"RefArrayOf constructor tests failed"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"RefArrayOf constructor tests failed"
+ << XERCES_STD_QUALIFIER endl;
retVal = false;
}
else
{
- std::wcout << L"RefArrayOf constructor tests passed"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"RefArrayOf constructor tests passed"
+ << XERCES_STD_QUALIFIER endl;
}
- std::wcout << std::endl;
+ XERCES_STD_QUALIFIER wcout << XERCES_STD_QUALIFIER endl;
- std::wcout << L"Testing RefArrayOf element access" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"Testing RefArrayOf element access" << XERCES_STD_QUALIFIER endl;
if (!accessTests())
{
- std::wcout << L"RefArrayOf element access tests failed"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"RefArrayOf element access tests failed"
+ << XERCES_STD_QUALIFIER endl;
retVal = false;
}
else
{
- std::wcout << L"RefArrayOf element access tests passed"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"RefArrayOf element access tests passed"
+ << XERCES_STD_QUALIFIER endl;
}
- std::wcout << std::endl;
+ XERCES_STD_QUALIFIER wcout << XERCES_STD_QUALIFIER endl;
}
catch(const XMLException& toCatch)
{
- std::wcout << L" ERROR: Unexpected exception!\n Msg: "
- << toCatch.getMessage() << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" ERROR: Unexpected exception!\n Msg: "
+ << toCatch.getMessage() << XERCES_STD_QUALIFIER endl;
return false;
}
return retVal;
1.7 +12 -9 xml-xerces/c/tests/UtilTests/CoreTests_RefHashTable.cpp
Index: CoreTests_RefHashTable.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/UtilTests/CoreTests_RefHashTable.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CoreTests_RefHashTable.cpp 5 Feb 2003 18:55:21 -0000 1.6
+++ CoreTests_RefHashTable.cpp 30 May 2003 13:08:26 -0000 1.7
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.7 2003/05/30 13:08:26 gareth
+ * move over to macros for std:: and iostream/iostream.h issues.
+ *
* Revision 1.6 2003/02/05 18:55:21 tng
* [Bug 11915] Utility for freeing memory.
*
@@ -145,32 +148,32 @@
// ---------------------------------------------------------------------------
bool testRefHashTable()
{
- std::wcout << L"----------------------------------\n"
+ XERCES_STD_QUALIFIER wcout << L"----------------------------------\n"
<< L"Testing RefHashTableOf class\n"
- << L"----------------------------------" << std::endl;
+ << L"----------------------------------" << XERCES_STD_QUALIFIER endl;
bool retVal = true;
try
{
- std::wcout << L"Testing basic RefHashtable methods" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"Testing basic RefHashtable methods" << XERCES_STD_QUALIFIER endl;
if (!basicTests())
{
- std::wcout << L"RefHashtable basic test methods failed"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"RefHashtable basic test methods failed"
+ << XERCES_STD_QUALIFIER endl;
retVal = false;
}
else
{
- std::wcout << L"RefHashtable basic tests passed" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"RefHashtable basic tests passed" << XERCES_STD_QUALIFIER endl;
}
- std::wcout << std::endl;
+ XERCES_STD_QUALIFIER wcout << XERCES_STD_QUALIFIER endl;
}
catch(const XMLException& toCatch)
{
- std::wcout << L" ERROR: Unexpected exception!\n Msg: "
- << toCatch.getMessage() << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" ERROR: Unexpected exception!\n Msg: "
+ << toCatch.getMessage() << XERCES_STD_QUALIFIER endl;
return false;
}
return retVal;
1.6 +12 -9 xml-xerces/c/tests/UtilTests/CoreTests_RefStack.cpp
Index: CoreTests_RefStack.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/UtilTests/CoreTests_RefStack.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CoreTests_RefStack.cpp 1 Feb 2002 22:46:28 -0000 1.5
+++ CoreTests_RefStack.cpp 30 May 2003 13:08:26 -0000 1.6
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2003/05/30 13:08:26 gareth
+ * move over to macros for std:: and iostream/iostream.h issues.
+ *
* Revision 1.5 2002/02/01 22:46:28 peiyongz
* sane_include
*
@@ -110,33 +113,33 @@
// ---------------------------------------------------------------------------
bool testRefStack()
{
- std::wcout << L"----------------------------------\n"
+ XERCES_STD_QUALIFIER wcout << L"----------------------------------\n"
<< L"Testing RefStackOf template class\n"
- << L"----------------------------------" << std::endl;
+ << L"----------------------------------" << XERCES_STD_QUALIFIER endl;
bool retVal = true;
try
{
// Call other local methods to do specific tests
- std::wcout << L"Testing RefStackOf basics" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"Testing RefStackOf basics" << XERCES_STD_QUALIFIER endl;
if (!basicTests())
{
- std::wcout << L"RefStackOf basic tests failed" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"RefStackOf basic tests failed" << XERCES_STD_QUALIFIER endl;
retVal = false;
}
else
{
- std::wcout << L"RefArrayOf constructor tests passed"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"RefArrayOf constructor tests passed"
+ << XERCES_STD_QUALIFIER endl;
}
- std::wcout << std::endl;
+ XERCES_STD_QUALIFIER wcout << XERCES_STD_QUALIFIER endl;
}
catch(const XMLException& toCatch)
{
- std::wcout << L" ERROR: Unexpected exception!\n Msg: "
- << toCatch.getMessage() << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" ERROR: Unexpected exception!\n Msg: "
+ << toCatch.getMessage() << XERCES_STD_QUALIFIER endl;
return false;
}
1.6 +49 -46 xml-xerces/c/tests/UtilTests/CoreTests_RefVector.cpp
Index: CoreTests_RefVector.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/UtilTests/CoreTests_RefVector.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CoreTests_RefVector.cpp 1 Feb 2002 22:46:28 -0000 1.5
+++ CoreTests_RefVector.cpp 30 May 2003 13:08:26 -0000 1.6
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2003/05/30 13:08:26 gareth
+ * move over to macros for std:: and iostream/iostream.h issues.
+ *
* Revision 1.5 2002/02/01 22:46:28 peiyongz
* sane_include
*
@@ -114,14 +117,14 @@
// Make sure the initial capacity is what we set
if (testVec.curCapacity() != testMax)
{
- std::wcout << L" Init capacity was incorrect" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" Init capacity was incorrect" << XERCES_STD_QUALIFIER endl;
return false;
}
// Make sure the initial size is zero
if (testVec.size() != 0)
{
- std::wcout << L" Init size was not correct" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" Init size was not correct" << XERCES_STD_QUALIFIER endl;
return false;
}
@@ -129,7 +132,7 @@
testVec.addElement(new T);
if (testVec.size() != 1)
{
- std::wcout << L" Adding one element caused bad size" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" Adding one element caused bad size" << XERCES_STD_QUALIFIER endl;
return false;
}
@@ -137,8 +140,8 @@
testVec.addElement(new T);
if (testVec.size() != 2)
{
- std::wcout << L" Adding another element caused bad size"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" Adding another element caused bad size"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
@@ -148,8 +151,8 @@
if (testVec.curCapacity() == testMax)
{
- std::wcout << L" Adding another element failed to cause an expansion"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" Adding another element failed to cause an expansion"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
@@ -167,8 +170,8 @@
if (!caughtIt)
{
- std::wcout << L" Failed to catch array bounds error at element 4"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" Failed to catch array bounds error at element 4"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
@@ -177,8 +180,8 @@
if (testVec.size() != 3)
{
- std::wcout << L" Removing an element did not adjust size correctly"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" Removing an element did not adjust size correctly"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
@@ -189,8 +192,8 @@
if (testVec.size() != 0)
{
- std::wcout << L" Removing all elements did not zero the size"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" Removing all elements did not zero the size"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
@@ -208,8 +211,8 @@
if (!caughtIt)
{
- std::wcout << L" Failed to catch array bounds error at element 0"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" Failed to catch array bounds error at element 0"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
@@ -219,7 +222,7 @@
testVec.insertElementAt(new T, 0);
if (testVec.size() != 3)
{
- std::wcout << L" Inserting elements caused bad size" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" Inserting elements caused bad size" << XERCES_STD_QUALIFIER endl;
return false;
}
@@ -228,7 +231,7 @@
if (testVec.size() != 0)
{
- std::wcout << L" removeAllElements caused bad size" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" removeAllElements caused bad size" << XERCES_STD_QUALIFIER endl;
return false;
}
@@ -257,8 +260,8 @@
{
if (*testVec.elementAt(index) != T(index))
{
- std::wcout << L" addElement put elements in wrong order"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" addElement put elements in wrong order"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
}
@@ -270,8 +273,8 @@
{
if (*testVec.elementAt(index) != T(index+1))
{
- std::wcout << L" removeElement at head removed wrong element"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" removeElement at head removed wrong element"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
}
@@ -283,8 +286,8 @@
{
if (*testVec.elementAt(index) != T(index+1))
{
- std::wcout << L" removeElement at end removed wrong element"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" removeElement at end removed wrong element"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
}
@@ -303,29 +306,29 @@
//
// Do the common reference vector tests for ints, bools and strings.
//
- std::wcout << L"Testing RefVectorOf<int>, common tests" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"Testing RefVectorOf<int>, common tests" << XERCES_STD_QUALIFIER endl;
if (!commonRefTests<int>())
{
- std::wcout << L"RefVectorOf<int> failed" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"RefVectorOf<int> failed" << XERCES_STD_QUALIFIER endl;
retVal = false;
}
else
{
- std::wcout << L"RefVectorOf<int> passed" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"RefVectorOf<int> passed" << XERCES_STD_QUALIFIER endl;
}
- std::wcout << std::endl;
+ XERCES_STD_QUALIFIER wcout << XERCES_STD_QUALIFIER endl;
- std::wcout << L"Testing RefVectorOf<bool>, common tests" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"Testing RefVectorOf<bool>, common tests" << XERCES_STD_QUALIFIER endl;
if (!commonRefTests<bool>())
{
- std::wcout << L"RefVectorOf<bool> failed" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"RefVectorOf<bool> failed" << XERCES_STD_QUALIFIER endl;
retVal = false;
}
else
{
- std::wcout << L"RefVectorOf<bool> passed" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"RefVectorOf<bool> passed" << XERCES_STD_QUALIFIER endl;
}
- std::wcout << std::endl;
+ XERCES_STD_QUALIFIER wcout << XERCES_STD_QUALIFIER endl;
//
@@ -333,17 +336,17 @@
// the instantiation type be of a fundamental value, because its going
// to test element ordering issues.
//
- std::wcout << L"Testing RefVectorOf<int>, extended tests" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"Testing RefVectorOf<int>, extended tests" << XERCES_STD_QUALIFIER endl;
if (!extendedRefTests<int>())
{
- std::wcout << L"Extended RefVectorOf<int> failed" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"Extended RefVectorOf<int> failed" << XERCES_STD_QUALIFIER endl;
retVal = false;
}
else
{
- std::wcout << L"Extended RefVectorOf<int> passed" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"Extended RefVectorOf<int> passed" << XERCES_STD_QUALIFIER endl;
}
- std::wcout << std::endl;
+ XERCES_STD_QUALIFIER wcout << XERCES_STD_QUALIFIER endl;
return retVal;
}
@@ -365,15 +368,15 @@
{
if (enumTest.nextElement() != index++)
{
- std::wcout << L" Enumerator sequence was incorrect" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" Enumerator sequence was incorrect" << XERCES_STD_QUALIFIER endl;
return false;
}
}
if (index != 32)
{
- std::wcout << L" Enumerator did not enum enough elements"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" Enumerator did not enum enough elements"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
return true;
@@ -386,9 +389,9 @@
// ---------------------------------------------------------------------------
bool testRefVector()
{
- std::wcout << L"----------------------------------\n"
+ XERCES_STD_QUALIFIER wcout << L"----------------------------------\n"
<< L"Testing RefVectorOf template class\n"
- << L"----------------------------------" << std::endl;
+ << L"----------------------------------" << XERCES_STD_QUALIFIER endl;
bool retVal = true;
@@ -399,23 +402,23 @@
retVal = false;
// Test the enumerator
- std::wcout << L"Testing RefVectorEnumerator" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"Testing RefVectorEnumerator" << XERCES_STD_QUALIFIER endl;
if (!enumTests())
{
- std::wcout << L"RefVectorEnumeration failed" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"RefVectorEnumeration failed" << XERCES_STD_QUALIFIER endl;
retVal = false;
}
else
{
- std::wcout << L"RefVectorEnumeration passed" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"RefVectorEnumeration passed" << XERCES_STD_QUALIFIER endl;
}
- std::wcout << std::endl;
+ XERCES_STD_QUALIFIER wcout << XERCES_STD_QUALIFIER endl;
}
catch(const XMLException& toCatch)
{
- std::wcout << L" ERROR: Unexpected exception!\n Msg: "
- << toCatch.getMessage() << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" ERROR: Unexpected exception!\n Msg: "
+ << toCatch.getMessage() << XERCES_STD_QUALIFIER endl;
return false;
}
return retVal;
1.6 +7 -4 xml-xerces/c/tests/UtilTests/CoreTests_String.cpp
Index: CoreTests_String.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/UtilTests/CoreTests_String.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CoreTests_String.cpp 1 Feb 2002 22:46:28 -0000 1.5
+++ CoreTests_String.cpp 30 May 2003 13:08:27 -0000 1.6
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2003/05/30 13:08:27 gareth
+ * move over to macros for std:: and iostream/iostream.h issues.
+ *
* Revision 1.5 2002/02/01 22:46:28 peiyongz
* sane_include
*
@@ -99,9 +102,9 @@
// ---------------------------------------------------------------------------
bool testString()
{
- std::wcout << L"----------------------------------\n"
+ XERCES_STD_QUALIFIER wcout << L"----------------------------------\n"
<< L"Testing String class\n"
- << L"----------------------------------" << std::endl;
+ << L"----------------------------------" << XERCES_STD_QUALIFIER endl;
bool retVal = true;
@@ -111,8 +114,8 @@
catch(const XMLException& toCatch)
{
- std::wcout << L" ERROR: Unexpected exception!\n Msg: "
- << toCatch.getMessage() << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" ERROR: Unexpected exception!\n Msg: "
+ << toCatch.getMessage() << XERCES_STD_QUALIFIER endl;
return false;
}
return retVal;
1.9 +5 -2 xml-xerces/c/tests/UtilTests/CoreTests_Transcoders.cpp
Index: CoreTests_Transcoders.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/UtilTests/CoreTests_Transcoders.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CoreTests_Transcoders.cpp 1 Feb 2002 22:46:28 -0000 1.8
+++ CoreTests_Transcoders.cpp 30 May 2003 13:08:27 -0000 1.9
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.9 2003/05/30 13:08:27 gareth
+ * move over to macros for std:: and iostream/iostream.h issues.
+ *
* Revision 1.8 2002/02/01 22:46:28 peiyongz
* sane_include
*
@@ -114,9 +117,9 @@
// ---------------------------------------------------------------------------
bool testTranscoders()
{
- std::wcout << L"----------------------------------\n"
+ XERCES_STD_QUALIFIER wcout << L"----------------------------------\n"
<< L"Testing transcoder classes\n"
- << L"----------------------------------" << std::endl;
+ << L"----------------------------------" << XERCES_STD_QUALIFIER endl;
return true;
}
1.10 +25 -22 xml-xerces/c/tests/UtilTests/CoreTests_URL.cpp
Index: CoreTests_URL.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/UtilTests/CoreTests_URL.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- CoreTests_URL.cpp 1 Feb 2002 22:46:28 -0000 1.9
+++ CoreTests_URL.cpp 30 May 2003 13:08:27 -0000 1.10
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.10 2003/05/30 13:08:27 gareth
+ * move over to macros for std:: and iostream/iostream.h issues.
+ *
* Revision 1.9 2002/02/01 22:46:28 peiyongz
* sane_include
*
@@ -135,20 +138,20 @@
if (!test && expected)
{
- std::wcout << L"Expected value for the " << fieldName
- << " field was not present" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"Expected value for the " << fieldName
+ << " field was not present" << XERCES_STD_QUALIFIER endl;
return false;
}
else if (test && !expected)
{
- std::wcout << L"The value '" << test << L"' for the " << fieldName
- << L" was not expected" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"The value '" << test << L"' for the " << fieldName
+ << L" was not expected" << XERCES_STD_QUALIFIER endl;
return false;
}
else if (XMLString::compareString(test, expected))
{
- std::wcout << L"Expected: " << expected << L", but got: " << test
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"Expected: " << expected << L", but got: " << test
+ << XERCES_STD_QUALIFIER endl;
return false;
}
return true;
@@ -173,8 +176,8 @@
if (testURL.getPortNum() != testInfo.portNum)
{
- std::wcout << L"Expected port number: " << testInfo.portNum
- << L" but got: " << testURL.getPortNum() << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"Expected port number: " << testInfo.portNum
+ << L" but got: " << testURL.getPortNum() << XERCES_STD_QUALIFIER endl;
return false;
}
@@ -393,8 +396,8 @@
if (XMLString::compareString(testURL.getURLText(), testList[index].result))
{
- std::wcout << L"Expected URL: " << testList[index].result
- << L" but got: " << testURL.getURLText() << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"Expected URL: " << testList[index].result
+ << L" but got: " << testURL.getURLText() << XERCES_STD_QUALIFIER endl;
retVal = false;
}
}
@@ -407,44 +410,44 @@
// ---------------------------------------------------------------------------
bool testURL()
{
- std::wcout << L"----------------------------------\n"
+ XERCES_STD_QUALIFIER wcout << L"----------------------------------\n"
<< L"Testing URL class \n"
<< L"----------------------------------"
- << std::endl;
+ << XERCES_STD_QUALIFIER endl;
bool retVal = true;
try
{
// Call other local methods to do specific tests
- std::wcout << L"Testing basic URL parsing" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"Testing basic URL parsing" << XERCES_STD_QUALIFIER endl;
if (!basicURLTest())
{
- std::wcout << L"Basic URL parsing tests failed" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"Basic URL parsing tests failed" << XERCES_STD_QUALIFIER endl;
retVal = false;
}
else
{
- std::wcout << L"Basic URL parsing tests passed" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"Basic URL parsing tests passed" << XERCES_STD_QUALIFIER endl;
}
- std::wcout << std::endl;
+ XERCES_STD_QUALIFIER wcout << XERCES_STD_QUALIFIER endl;
- std::wcout << L"Testing relative URL parsing" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"Testing relative URL parsing" << XERCES_STD_QUALIFIER endl;
if (!relativeURLTest())
{
- std::wcout << L"Relative URL parsing tests failed" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"Relative URL parsing tests failed" << XERCES_STD_QUALIFIER endl;
retVal = false;
}
else
{
- std::wcout << L"Relative URL parsing tests passed" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"Relative URL parsing tests passed" << XERCES_STD_QUALIFIER endl;
}
- std::wcout << std::endl;
+ XERCES_STD_QUALIFIER wcout << XERCES_STD_QUALIFIER endl;
}
catch(const XMLException& toCatch)
{
- std::wcout << L" ERROR: Unexpected exception!\n Msg: "
- << toCatch.getMessage() << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" ERROR: Unexpected exception!\n Msg: "
+ << toCatch.getMessage() << XERCES_STD_QUALIFIER endl;
return false;
}
return retVal;
1.6 +34 -31 xml-xerces/c/tests/UtilTests/CoreTests_ValueArray.cpp
Index: CoreTests_ValueArray.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/UtilTests/CoreTests_ValueArray.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CoreTests_ValueArray.cpp 1 Feb 2002 22:46:28 -0000 1.5
+++ CoreTests_ValueArray.cpp 30 May 2003 13:08:27 -0000 1.6
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2003/05/30 13:08:27 gareth
+ * move over to macros for std:: and iostream/iostream.h issues.
+ *
* Revision 1.5 2002/02/01 22:46:28 peiyongz
* sane_include
*
@@ -106,8 +109,8 @@
// Make sure that it has the right initial size
if (testArray1.length() != 255)
{
- std::wcout << L" The ctor created wrong length() value"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" The ctor created wrong length() value"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
@@ -116,16 +119,16 @@
if (testArray2.length() != 255)
{
- std::wcout << L" The copy ctor created wrong length() value"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" The copy ctor created wrong length() value"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
// Test the equality of the two arrays
if (testArray1 != testArray2)
{
- std::wcout << L" The copy ctor created unequal arrays"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" The copy ctor created unequal arrays"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
@@ -137,8 +140,8 @@
if (testArray3.length() != 4)
{
- std::wcout << L" The init values ctor created wrong length() value"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" The init values ctor created wrong length() value"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
@@ -148,8 +151,8 @@
|| (testArray3[2] != 3.3)
|| (testArray3[3] != 4.4))
{
- std::wcout << L" The init values ctor did not init contents correctly"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" The init values ctor did not init contents correctly"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
@@ -162,8 +165,8 @@
if (testArray4 != testArray3)
{
- std::wcout << L" Assignment did not create equal arrays"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" Assignment did not create equal arrays"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
return true;
@@ -184,8 +187,8 @@
{
if (testArray1[index] != index)
{
- std::wcout << L" Failed to read back values just set"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" Failed to read back values just set"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
}
@@ -204,7 +207,7 @@
if (!caughtIt)
{
- std::wcout << L" Failed to catch index error" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" Failed to catch index error" << XERCES_STD_QUALIFIER endl;
return false;
}
@@ -217,48 +220,48 @@
// ---------------------------------------------------------------------------
bool testValueArray()
{
- std::wcout << L"----------------------------------\n"
+ XERCES_STD_QUALIFIER wcout << L"----------------------------------\n"
<< L"Testing ValueArrayOf template class\n"
- << L"----------------------------------" << std::endl;
+ << L"----------------------------------" << XERCES_STD_QUALIFIER endl;
bool retVal = true;
try
{
// Call other local methods to do specific tests
- std::wcout << L"Testing ValueArrayOf contructors" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"Testing ValueArrayOf contructors" << XERCES_STD_QUALIFIER endl;
if (!constructorTests())
{
- std::wcout << L"ValueArrayOf constructor tests failed"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"ValueArrayOf constructor tests failed"
+ << XERCES_STD_QUALIFIER endl;
retVal = false;
}
else
{
- std::wcout << L"ValueArrayOf constructor tests passed"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"ValueArrayOf constructor tests passed"
+ << XERCES_STD_QUALIFIER endl;
}
- std::wcout << std::endl;
+ XERCES_STD_QUALIFIER wcout << XERCES_STD_QUALIFIER endl;
- std::wcout << L"Testing ValueArrayOf element access" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"Testing ValueArrayOf element access" << XERCES_STD_QUALIFIER endl;
if (!accessTests())
{
- std::wcout << L"ValueArrayOf element access tests failed"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"ValueArrayOf element access tests failed"
+ << XERCES_STD_QUALIFIER endl;
retVal = false;
}
else
{
- std::wcout << L"ValueArrayOf element access tests passed"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"ValueArrayOf element access tests passed"
+ << XERCES_STD_QUALIFIER endl;
}
- std::wcout << std::endl;
+ XERCES_STD_QUALIFIER wcout << XERCES_STD_QUALIFIER endl;
}
catch(const XMLException& toCatch)
{
- std::wcout << L" ERROR: Unexpected exception!\n Msg: "
- << toCatch.getMessage() << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" ERROR: Unexpected exception!\n Msg: "
+ << toCatch.getMessage() << XERCES_STD_QUALIFIER endl;
return false;
}
return retVal;
1.6 +12 -9 xml-xerces/c/tests/UtilTests/CoreTests_ValueStack.cpp
Index: CoreTests_ValueStack.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/UtilTests/CoreTests_ValueStack.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CoreTests_ValueStack.cpp 1 Feb 2002 22:46:28 -0000 1.5
+++ CoreTests_ValueStack.cpp 30 May 2003 13:08:27 -0000 1.6
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2003/05/30 13:08:27 gareth
+ * move over to macros for std:: and iostream/iostream.h issues.
+ *
* Revision 1.5 2002/02/01 22:46:28 peiyongz
* sane_include
*
@@ -110,33 +113,33 @@
// ---------------------------------------------------------------------------
bool testValueStack()
{
- std::wcout << L"----------------------------------\n"
+ XERCES_STD_QUALIFIER wcout << L"----------------------------------\n"
<< L"Testing ValueStackOf template class\n"
- << L"----------------------------------" << std::endl;
+ << L"----------------------------------" << XERCES_STD_QUALIFIER endl;
bool retVal = true;
try
{
// Call other local methods to do specific tests
- std::wcout << L"Testing ValueStackOf basics" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"Testing ValueStackOf basics" << XERCES_STD_QUALIFIER endl;
if (!basicTests())
{
- std::wcout << L"ValueStackOf basic tests failed" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"ValueStackOf basic tests failed" << XERCES_STD_QUALIFIER endl;
retVal = false;
}
else
{
- std::wcout << L"ValueArrayOf constructor tests passed"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"ValueArrayOf constructor tests passed"
+ << XERCES_STD_QUALIFIER endl;
}
- std::wcout << std::endl;
+ XERCES_STD_QUALIFIER wcout << XERCES_STD_QUALIFIER endl;
}
catch(const XMLException& toCatch)
{
- std::wcout << L" ERROR: Unexpected exception!\n Msg: "
- << toCatch.getMessage() << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" ERROR: Unexpected exception!\n Msg: "
+ << toCatch.getMessage() << XERCES_STD_QUALIFIER endl;
return false;
}
return retVal;
1.6 +50 -47 xml-xerces/c/tests/UtilTests/CoreTests_ValueVector.cpp
Index: CoreTests_ValueVector.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/UtilTests/CoreTests_ValueVector.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CoreTests_ValueVector.cpp 1 Feb 2002 22:46:28 -0000 1.5
+++ CoreTests_ValueVector.cpp 30 May 2003 13:08:27 -0000 1.6
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2003/05/30 13:08:27 gareth
+ * move over to macros for std:: and iostream/iostream.h issues.
+ *
* Revision 1.5 2002/02/01 22:46:28 peiyongz
* sane_include
*
@@ -109,14 +112,14 @@
// Make sure the initial capacity is what we set
if (testVec.curCapacity() != testMax)
{
- std::wcout << L" Init capacity was bad" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" Init capacity was bad" << XERCES_STD_QUALIFIER endl;
return false;
}
// Make sure the initial size is zero
if (testVec.size() != 0)
{
- std::wcout << L" Init size was bad" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" Init size was bad" << XERCES_STD_QUALIFIER endl;
return false;
}
@@ -127,7 +130,7 @@
testVec.addElement(testElem);
if (testVec.size() != 1)
{
- std::wcout << L" Adding one element caused bad size" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" Adding one element caused bad size" << XERCES_STD_QUALIFIER endl;
return false;
}
@@ -135,14 +138,14 @@
testVec.addElement(testElem);
if (testVec.size() != 2)
{
- std::wcout << L" Adding another element caused bad size" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" Adding another element caused bad size" << XERCES_STD_QUALIFIER endl;
return false;
}
// Test that the two of them are the same
if (testVec.elementAt(0) != testVec.elementAt(1))
{
- std::wcout << L" First two elements did not match" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" First two elements did not match" << XERCES_STD_QUALIFIER endl;
return false;
}
@@ -152,8 +155,8 @@
if (testVec.curCapacity() == testMax)
{
- std::wcout << L" Adding another element failed to cause an expansion"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" Adding another element failed to cause an expansion"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
@@ -171,8 +174,8 @@
if (!caughtIt)
{
- std::wcout << L" Failed to catch array bounds error at element 4"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" Failed to catch array bounds error at element 4"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
@@ -181,8 +184,8 @@
if (testVec.size() != 3)
{
- std::wcout << L" Removing an element did not adjust size correctly"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" Removing an element did not adjust size correctly"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
@@ -193,8 +196,8 @@
if (testVec.size() != 0)
{
- std::wcout << L" Removing all elements did not zero the size"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" Removing all elements did not zero the size"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
@@ -212,8 +215,8 @@
if (!caughtIt)
{
- std::wcout << L" Failed to catch array bounds error at element 0"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" Failed to catch array bounds error at element 0"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
@@ -223,7 +226,7 @@
testVec.insertElementAt(testElem, 0);
if (testVec.size() != 3)
{
- std::wcout << L" Inserting elements caused bad size" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" Inserting elements caused bad size" << XERCES_STD_QUALIFIER endl;
return false;
}
@@ -232,7 +235,7 @@
if (testVec.size() != 0)
{
- std::wcout << L" removeAllElements caused bad size" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" removeAllElements caused bad size" << XERCES_STD_QUALIFIER endl;
return false;
}
return true;
@@ -260,8 +263,8 @@
{
if (testVec.elementAt(index) != T(index))
{
- std::wcout << L" addElement put elements in wrong order"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" addElement put elements in wrong order"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
}
@@ -273,8 +276,8 @@
{
if (testVec.elementAt(index) != T(index+1))
{
- std::wcout << L" removeElement at head removed wrong element"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" removeElement at head removed wrong element"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
}
@@ -286,8 +289,8 @@
{
if (testVec.elementAt(index) != T(index+1))
{
- std::wcout << L" removeElement at end removed wrong element"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" removeElement at end removed wrong element"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
}
@@ -305,29 +308,29 @@
//
// Do the common value vector tests for ints, bools and strings.
//
- std::wcout << L"Testing ValueVectorOf<int>, common tests" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"Testing ValueVectorOf<int>, common tests" << XERCES_STD_QUALIFIER endl;
if (!commonValueTests<int>())
{
- std::wcout << L"ValueVectorOf<int> failed" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"ValueVectorOf<int> failed" << XERCES_STD_QUALIFIER endl;
retVal = false;
}
else
{
- std::wcout << L"ValueVectorOf<int> passed" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"ValueVectorOf<int> passed" << XERCES_STD_QUALIFIER endl;
}
- std::wcout << std::endl;
+ XERCES_STD_QUALIFIER wcout << XERCES_STD_QUALIFIER endl;
- std::wcout << L"Testing ValueVectorOf<bool>, common tests" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"Testing ValueVectorOf<bool>, common tests" << XERCES_STD_QUALIFIER endl;
if (!commonValueTests<bool>())
{
- std::wcout << L"ValueVectorOf<bool> failed" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"ValueVectorOf<bool> failed" << XERCES_STD_QUALIFIER endl;
retVal = false;
}
else
{
- std::wcout << L"ValueVectorOf<bool> passed" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"ValueVectorOf<bool> passed" << XERCES_STD_QUALIFIER endl;
}
- std::wcout << std::endl;
+ XERCES_STD_QUALIFIER wcout << XERCES_STD_QUALIFIER endl;
//
@@ -335,17 +338,17 @@
// the instantiation type be of a fundamental value, because its going
// to test element ordering issues.
//
- std::wcout << L"Testing ValueVectorOf<int>, extended tests" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"Testing ValueVectorOf<int>, extended tests" << XERCES_STD_QUALIFIER endl;
if (!extendedValueTests<int>())
{
- std::wcout << L"Extended ValueVectorOf<int> failed" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"Extended ValueVectorOf<int> failed" << XERCES_STD_QUALIFIER endl;
retVal = false;
}
else
{
- std::wcout << L"Extended ValueVectorOf<int> passed" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"Extended ValueVectorOf<int> passed" << XERCES_STD_QUALIFIER endl;
}
- std::wcout << std::endl;
+ XERCES_STD_QUALIFIER wcout << XERCES_STD_QUALIFIER endl;
return retVal;
}
@@ -367,16 +370,16 @@
{
if (enumTest.nextElement() != index++)
{
- std::wcout << L" Enumerator sequence was incorrect"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" Enumerator sequence was incorrect"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
}
if (index != 32)
{
- std::wcout << L" Enumerator did not enum enough elements"
- << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" Enumerator did not enum enough elements"
+ << XERCES_STD_QUALIFIER endl;
return false;
}
@@ -389,9 +392,9 @@
// ---------------------------------------------------------------------------
bool testValueVector()
{
- std::wcout << L"----------------------------------\n"
+ XERCES_STD_QUALIFIER wcout << L"----------------------------------\n"
<< L"Testing ValueVectorOf template class\n"
- << L"----------------------------------" << std::endl;
+ << L"----------------------------------" << XERCES_STD_QUALIFIER endl;
bool retVal = true;
@@ -402,23 +405,23 @@
retVal = false;
// Test the enumerator
- std::wcout << L"Testing ValueVectorEnumerator" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"Testing ValueVectorEnumerator" << XERCES_STD_QUALIFIER endl;
if (!enumTests())
{
- std::wcout << L"ValueVectorEnumeration failed" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"ValueVectorEnumeration failed" << XERCES_STD_QUALIFIER endl;
retVal = false;
}
else
{
- std::wcout << L"ValueVectorEnumeration passed" << std::endl;
+ XERCES_STD_QUALIFIER wcout << L"ValueVectorEnumeration passed" << XERCES_STD_QUALIFIER endl;
}
- std::wcout << std::endl;
+ XERCES_STD_QUALIFIER wcout << XERCES_STD_QUALIFIER endl;
}
catch(const XMLException& toCatch)
{
- std::wcout << L" ERROR: Unexpected exception!\n Msg: "
- << toCatch.getMessage() << std::endl;
+ XERCES_STD_QUALIFIER wcout << L" ERROR: Unexpected exception!\n Msg: "
+ << toCatch.getMessage() << XERCES_STD_QUALIFIER endl;
return false;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org