Remove XALAN_CLASSIC_IOSTREAMS
diff --git a/Tests/Compare/compare.cpp b/Tests/Compare/compare.cpp
index 607a985..305b8e8 100644
--- a/Tests/Compare/compare.cpp
+++ b/Tests/Compare/compare.cpp
@@ -21,13 +21,8 @@
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#include <strstream.h>
-#else
#include <iostream>
#include <strstream>
-#endif
#include <cstdio>
diff --git a/Tests/Conf/conf.cpp b/Tests/Conf/conf.cpp
index aaf630a..956b25f 100644
--- a/Tests/Conf/conf.cpp
+++ b/Tests/Conf/conf.cpp
@@ -21,13 +21,8 @@
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#include <strstream.h>
-#else
#include <iostream>
#include <strstream>
-#endif
#include <cstdio>
diff --git a/Tests/Dom2Dom/dom2dom.cpp b/Tests/Dom2Dom/dom2dom.cpp
index d9f27ec..a28f07f 100644
--- a/Tests/Dom2Dom/dom2dom.cpp
+++ b/Tests/Dom2Dom/dom2dom.cpp
@@ -22,13 +22,8 @@
#include <cstdio>
#include <direct.h>
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#include <strstream.h>
-#else
#include <iostream>
#include <strstream>
-#endif
#include <vector>
diff --git a/Tests/Errortests/Errortests.cpp b/Tests/Errortests/Errortests.cpp
index a0e67e6..e77eb23 100644
--- a/Tests/Errortests/Errortests.cpp
+++ b/Tests/Errortests/Errortests.cpp
@@ -22,13 +22,8 @@
#include <cstdio>
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#include <strstream.h>
-#else
#include <iostream>
#include <strstream>
-#endif
using std::cerr;
diff --git a/Tests/Extensions/extensions.cpp b/Tests/Extensions/extensions.cpp
index 3ad9c32..f38cfe8 100644
--- a/Tests/Extensions/extensions.cpp
+++ b/Tests/Extensions/extensions.cpp
@@ -22,13 +22,8 @@
#include <cstdio>
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#include <strstream.h>
-#else
#include <iostream>
#include <strstream>
-#endif
diff --git a/Tests/InputSource/inputsource.cpp b/Tests/InputSource/inputsource.cpp
index ee79c27..a047f5c 100644
--- a/Tests/InputSource/inputsource.cpp
+++ b/Tests/InputSource/inputsource.cpp
@@ -22,11 +22,7 @@
#include <cstdio>
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#else
#include <iostream>
-#endif
diff --git a/Tests/Memory/Stressmem.cpp b/Tests/Memory/Stressmem.cpp
index 639e48e..f3205bd 100644
--- a/Tests/Memory/Stressmem.cpp
+++ b/Tests/Memory/Stressmem.cpp
@@ -21,11 +21,7 @@
#include <cstdio>
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#else
#include <iostream>
-#endif
diff --git a/Tests/Params/Params.cpp b/Tests/Params/Params.cpp
index 6312874..7cb288f 100644
--- a/Tests/Params/Params.cpp
+++ b/Tests/Params/Params.cpp
@@ -22,11 +22,7 @@
#include <cstdio>
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#else
#include <iostream>
-#endif
// This is here for memory leak testing.
#if !defined(NDEBUG) && defined(_MSC_VER)
diff --git a/Tests/PerfT/perft.cpp b/Tests/PerfT/perft.cpp
index 5fc9976..bbed2a4 100644
--- a/Tests/PerfT/perft.cpp
+++ b/Tests/PerfT/perft.cpp
@@ -23,11 +23,7 @@
#include <cstdio>
#include <ctime>
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#else
#include <iostream>
-#endif
diff --git a/Tests/Performance/Logger.cpp b/Tests/Performance/Logger.cpp
index 21510f1..e25dad9 100644
--- a/Tests/Performance/Logger.cpp
+++ b/Tests/Performance/Logger.cpp
@@ -28,13 +28,8 @@
#include <ctime>
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#include <iomanip.h>
-#else
#include <iostream>
#include <iomanip>
-#endif
using xalanc::XalanDOMString;
diff --git a/Tests/Performance/Logger.hpp b/Tests/Performance/Logger.hpp
index cc166bf..c90ecc8 100644
--- a/Tests/Performance/Logger.hpp
+++ b/Tests/Performance/Logger.hpp
@@ -25,12 +25,7 @@
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#else
#include <iosfwd>
-//#include <ios>
-#endif
diff --git a/Tests/Performance/Parameters.cpp b/Tests/Performance/Parameters.cpp
index 84a11a5..a2e5d60 100644
--- a/Tests/Performance/Parameters.cpp
+++ b/Tests/Performance/Parameters.cpp
@@ -20,11 +20,7 @@
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iomanip.h>
-#else
#include <iomanip>
-#endif
diff --git a/Tests/Performance/TestHarness.hpp b/Tests/Performance/TestHarness.hpp
index dff71f5..9d8dec5 100644
--- a/Tests/Performance/TestHarness.hpp
+++ b/Tests/Performance/TestHarness.hpp
@@ -24,12 +24,8 @@
#include <climits>
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <fstream.h>
-#else
#include <fstream>
#include <sstream>
-#endif
@@ -206,22 +202,10 @@
if (testCase.inputMode == XalanDOMString("stream"))
{
-#if defined(XALAN_CLASSIC_IOSTREAMS)
- using xalanc::CharVectorType;
- using xalanc::c_str;
-
- using std::istringstream;
-
- CharVectorType buffer;
- fileToStream(testCase.stylesheet, buffer);
-
- istrstream compilerStream(c_str(buffer));
-#else
using std::istringstream;
istringstream compilerStream;
fileToStream(testCase.stylesheet, compilerStream);
-#endif
timeCompile.start();
compiledStylesheet = m_processor.compileStylesheet(
compilerStream,
@@ -272,22 +256,10 @@
if (testCase.inputMode == XalanDOMString("stream") &&
!parsedInputSource)
{
-#if defined(XALAN_CLASSIC_IOSTREAMS)
- using xalanc::CharVectorType;
- using xalanc::c_str;
-
- using std::istringstream;
-
- CharVectorType buffer;
- fileToStream(testCase.inputDocument, buffer);
-
- istrstream inputStream(c_str(buffer));
-#else
using std::istringstream;
istringstream inputStream;
fileToStream(testCase.inputDocument, inputStream);
-#endif
timeInput.start();
parsedInputSource = m_processor.parseInputSource(
diff --git a/Tests/Performance/Utils.cpp b/Tests/Performance/Utils.cpp
index fc3f52b..1bb857a 100644
--- a/Tests/Performance/Utils.cpp
+++ b/Tests/Performance/Utils.cpp
@@ -25,9 +25,7 @@
#include <stdio.h>
-#if !defined(XALAN_CLASSIC_IOSTREAMS)
#include <sstream>
-#endif
@@ -97,11 +95,7 @@
void fileToStream(
const XalanDOMString& fileName,
-#if defined(XALAN_CLASSIC_IOSTREAMS)
- CharVectorType& resultStream)
-#else
std::istringstream& resultStream)
-#endif
{
CharVectorType resultFileName;
fileName.transcode(resultFileName);
@@ -111,26 +105,16 @@
ifstream resultFile(c_str(resultFileName));
-#if !defined(XALAN_CLASSIC_IOSTREAMS)
ostringstream fileOutputStream;
-#endif
char ch;
while(resultFile.get(ch))
{
-#if defined(XALAN_CLASSIC_IOSTREAMS)
- resultStream.push_back(ch);
-#else
fileOutputStream.put(ch);
-#endif
}
-#if defined(XALAN_CLASSIC_IOSTREAMS)
- resultStream.push_back('\0');
-#else
resultStream.str(fileOutputStream.str());
-#endif
}
diff --git a/Tests/Performance/Utils.hpp b/Tests/Performance/Utils.hpp
index bc02561..23b14ed 100644
--- a/Tests/Performance/Utils.hpp
+++ b/Tests/Performance/Utils.hpp
@@ -25,11 +25,7 @@
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <fstream.h>
-#else
#include <fstream>
-#endif
#include <xalanc/Harness/XalanFileUtility.hpp>
@@ -73,11 +69,7 @@
void
fileToStream(
const XalanDOMString& fileName,
-#if defined(XALAN_CLASSIC_IOSTREAMS)
- xalanc::CharVectorType& resultStream);
-#else
std::istringstream& resultStream);
-#endif
/**
diff --git a/Tests/Performance/XalanCProcessor.cpp b/Tests/Performance/XalanCProcessor.cpp
index 54f3c5b..d0dad09 100644
--- a/Tests/Performance/XalanCProcessor.cpp
+++ b/Tests/Performance/XalanCProcessor.cpp
@@ -21,11 +21,7 @@
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#else
#include <iostream>
-#endif
diff --git a/Tests/Performance/XalanCProcessor.hpp b/Tests/Performance/XalanCProcessor.hpp
index 9ae1d70..e2023d2 100644
--- a/Tests/Performance/XalanCProcessor.hpp
+++ b/Tests/Performance/XalanCProcessor.hpp
@@ -23,11 +23,7 @@
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <strstream.h>
-#else
#include <sstream>
-#endif
@@ -351,11 +347,7 @@
void reset() { stringstream.flush();}
-#if defined(XALAN_CLASSIC_IOSTREAMS)
- ostrstream stringstream;
-#else
std::ostringstream stringstream;
-#endif
};
StreamResult m_streamResult;
diff --git a/Tests/Performance/perf.cpp b/Tests/Performance/perf.cpp
index 7adab39..ccd1cad 100644
--- a/Tests/Performance/perf.cpp
+++ b/Tests/Performance/perf.cpp
@@ -22,11 +22,7 @@
#include <cstring>
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#else
#include <iostream>
-#endif
diff --git a/Tests/Threads/ThreadTest.cpp b/Tests/Threads/ThreadTest.cpp
index 33acb33..226dbed 100644
--- a/Tests/Threads/ThreadTest.cpp
+++ b/Tests/Threads/ThreadTest.cpp
@@ -32,11 +32,7 @@
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#else
#include <iostream>
-#endif
diff --git a/Tests/Transformer/TestXalanTransformer.cpp b/Tests/Transformer/TestXalanTransformer.cpp
index 46dbf33..d9155fa 100644
--- a/Tests/Transformer/TestXalanTransformer.cpp
+++ b/Tests/Transformer/TestXalanTransformer.cpp
@@ -37,13 +37,8 @@
#include <xalanc/XalanTransformer/XalanTransformer.hpp>
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#include <strstream.h>
-#else
#include <iostream>
#include <strstream>
-#endif
using std::cerr;
diff --git a/samples/CompileStylesheet/CompileStylesheet.cpp b/samples/CompileStylesheet/CompileStylesheet.cpp
index 588b53e..9ec7796 100644
--- a/samples/CompileStylesheet/CompileStylesheet.cpp
+++ b/samples/CompileStylesheet/CompileStylesheet.cpp
@@ -24,15 +24,9 @@
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <fstream.h>
-#include <iostream.h>
-#include <strstream.h>
-#else
#include <fstream>
#include <iostream>
#include <strstream>
-#endif
diff --git a/samples/DocumentBuilder/DocumentBuilder.cpp b/samples/DocumentBuilder/DocumentBuilder.cpp
index 6b08d3d..9dc498a 100644
--- a/samples/DocumentBuilder/DocumentBuilder.cpp
+++ b/samples/DocumentBuilder/DocumentBuilder.cpp
@@ -20,11 +20,7 @@
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#else
#include <iostream>
-#endif
diff --git a/samples/EntityResolver/EntityResolver.cpp b/samples/EntityResolver/EntityResolver.cpp
index ed41080..0d9d228 100644
--- a/samples/EntityResolver/EntityResolver.cpp
+++ b/samples/EntityResolver/EntityResolver.cpp
@@ -21,11 +21,7 @@
#include <cassert>
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#else
#include <iostream>
-#endif
diff --git a/samples/ExternalFunction/ExternalFunction.cpp b/samples/ExternalFunction/ExternalFunction.cpp
index 3cdcfd0..aec820d 100644
--- a/samples/ExternalFunction/ExternalFunction.cpp
+++ b/samples/ExternalFunction/ExternalFunction.cpp
@@ -23,11 +23,7 @@
#include <cmath>
#include <cstring>
#include <ctime>
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#else
#include <iostream>
-#endif
diff --git a/samples/ParsedSourceWrappers/ParsedSourceWrappers.cpp b/samples/ParsedSourceWrappers/ParsedSourceWrappers.cpp
index bdd406b..20e96cd 100644
--- a/samples/ParsedSourceWrappers/ParsedSourceWrappers.cpp
+++ b/samples/ParsedSourceWrappers/ParsedSourceWrappers.cpp
@@ -21,11 +21,7 @@
#include <cassert>
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#else
#include <iostream>
-#endif
diff --git a/samples/SerializeNodeSet/SerializeNodeSet.cpp b/samples/SerializeNodeSet/SerializeNodeSet.cpp
index 11a5377..50ca244 100644
--- a/samples/SerializeNodeSet/SerializeNodeSet.cpp
+++ b/samples/SerializeNodeSet/SerializeNodeSet.cpp
@@ -22,11 +22,7 @@
#include <cassert>
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#else
#include <iostream>
-#endif
diff --git a/samples/SimpleTransform/SimpleTransform.cpp b/samples/SimpleTransform/SimpleTransform.cpp
index 06937ec..dee76e2 100644
--- a/samples/SimpleTransform/SimpleTransform.cpp
+++ b/samples/SimpleTransform/SimpleTransform.cpp
@@ -20,11 +20,7 @@
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#else
#include <iostream>
-#endif
diff --git a/samples/SimpleXPathAPI/SimpleXPathAPI.cpp b/samples/SimpleXPathAPI/SimpleXPathAPI.cpp
index e804b88..ab1f46c 100644
--- a/samples/SimpleXPathAPI/SimpleXPathAPI.cpp
+++ b/samples/SimpleXPathAPI/SimpleXPathAPI.cpp
@@ -23,11 +23,7 @@
#include <cassert>
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#else
#include <iostream>
-#endif
diff --git a/samples/StreamTransform/StreamTransform.cpp b/samples/StreamTransform/StreamTransform.cpp
index a7008ea..2f47a8a 100644
--- a/samples/StreamTransform/StreamTransform.cpp
+++ b/samples/StreamTransform/StreamTransform.cpp
@@ -21,15 +21,9 @@
#include <cstring>
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#include <strstream.h>
-#include <fstream.h>
-#else
#include <iostream>
#include <strstream>
#include <fstream>
-#endif
diff --git a/samples/ThreadSafe/ThreadSafe.cpp b/samples/ThreadSafe/ThreadSafe.cpp
index febe13c..c1fd86b 100644
--- a/samples/ThreadSafe/ThreadSafe.cpp
+++ b/samples/ThreadSafe/ThreadSafe.cpp
@@ -24,15 +24,9 @@
#include <ctime>
#include <vector>
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <fstream.h>
-#include <iostream.h>
-#include <strstream.h>
-#else
#include <fstream>
#include <iostream>
#include <strstream>
-#endif
diff --git a/samples/TraceListen/TraceListen.cpp b/samples/TraceListen/TraceListen.cpp
index 7e51717..7fda08f 100644
--- a/samples/TraceListen/TraceListen.cpp
+++ b/samples/TraceListen/TraceListen.cpp
@@ -21,13 +21,8 @@
#include <cstring>
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <fstream.h>
-#include <iostream.h>
-#else
#include <fstream>
#include <iostream>
-#endif
diff --git a/samples/TransformToXercesDOM/TransformToXercesDOM.cpp b/samples/TransformToXercesDOM/TransformToXercesDOM.cpp
index e398882..c4082a6 100644
--- a/samples/TransformToXercesDOM/TransformToXercesDOM.cpp
+++ b/samples/TransformToXercesDOM/TransformToXercesDOM.cpp
@@ -22,11 +22,7 @@
#include <cassert>
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#else
#include <iostream>
-#endif
diff --git a/samples/UseStylesheetParam/UseStylesheetParam.cpp b/samples/UseStylesheetParam/UseStylesheetParam.cpp
index 7a5062e..5a04300 100644
--- a/samples/UseStylesheetParam/UseStylesheetParam.cpp
+++ b/samples/UseStylesheetParam/UseStylesheetParam.cpp
@@ -18,11 +18,7 @@
#include <xalanc/Include/PlatformDefinitions.hpp>
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#else
#include <iostream>
-#endif
// for 'C' strcmp function used in parsing main() parameters
#include <string.h>
diff --git a/samples/XPathWrapper/TestDriver.cpp b/samples/XPathWrapper/TestDriver.cpp
index 92e3571..efba36f 100644
--- a/samples/XPathWrapper/TestDriver.cpp
+++ b/samples/XPathWrapper/TestDriver.cpp
@@ -29,13 +29,8 @@
#include <xalanc/XalanTransformer/XalanTransformer.hpp>
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <fstream.h>
-#include <iostream.h>
-#else
#include <fstream>
#include <iostream>
-#endif
diff --git a/samples/XPathWrapper/XPathWrapper.cpp b/samples/XPathWrapper/XPathWrapper.cpp
index f3616b6..9776772 100644
--- a/samples/XPathWrapper/XPathWrapper.cpp
+++ b/samples/XPathWrapper/XPathWrapper.cpp
@@ -23,11 +23,7 @@
#include <cassert>
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#else
#include <iostream>
-#endif
diff --git a/samples/XalanTransform/XalanTransform.cpp b/samples/XalanTransform/XalanTransform.cpp
index 3063dda..55be61c 100644
--- a/samples/XalanTransform/XalanTransform.cpp
+++ b/samples/XalanTransform/XalanTransform.cpp
@@ -20,11 +20,7 @@
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#else
#include <iostream>
-#endif
diff --git a/samples/XalanTransformerCallback/XalanTransformerCallback.cpp b/samples/XalanTransformerCallback/XalanTransformerCallback.cpp
index 4ab16cf..4828cee 100644
--- a/samples/XalanTransformerCallback/XalanTransformerCallback.cpp
+++ b/samples/XalanTransformerCallback/XalanTransformerCallback.cpp
@@ -26,11 +26,7 @@
#include <cstdio>
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#else
#include <iostream>
-#endif
diff --git a/src/xalanc/Harness/XalanDiagnosticMemoryManager.cpp b/src/xalanc/Harness/XalanDiagnosticMemoryManager.cpp
index cb3d747..06289ce 100644
--- a/src/xalanc/Harness/XalanDiagnosticMemoryManager.cpp
+++ b/src/xalanc/Harness/XalanDiagnosticMemoryManager.cpp
@@ -19,9 +19,7 @@
-#if !defined(XALAN_CLASSIC_IOSTREAMS)
#include <iostream>
-#endif
diff --git a/src/xalanc/Harness/XalanDiagnosticMemoryManager.hpp b/src/xalanc/Harness/XalanDiagnosticMemoryManager.hpp
index f59cebc..2532a50 100644
--- a/src/xalanc/Harness/XalanDiagnosticMemoryManager.hpp
+++ b/src/xalanc/Harness/XalanDiagnosticMemoryManager.hpp
@@ -28,12 +28,8 @@
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#else
#include <iosfwd>
#include <ios>
-#endif
diff --git a/src/xalanc/Harness/XalanFileUtility.cpp b/src/xalanc/Harness/XalanFileUtility.cpp
index ef65bbf..dcd47fe 100644
--- a/src/xalanc/Harness/XalanFileUtility.cpp
+++ b/src/xalanc/Harness/XalanFileUtility.cpp
@@ -44,13 +44,8 @@
#endif
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#include <strstream.h>
-#else
#include <iostream>
#include <strstream>
-#endif
#if !defined(NDEBUG) && defined(_MSC_VER)
#include <crtdbg.h>
diff --git a/src/xalanc/Harness/XalanFileUtility.hpp b/src/xalanc/Harness/XalanFileUtility.hpp
index 522e8fe..2c45e04 100644
--- a/src/xalanc/Harness/XalanFileUtility.hpp
+++ b/src/xalanc/Harness/XalanFileUtility.hpp
@@ -26,11 +26,7 @@
#include "xalanc/Include/XalanVector.hpp"
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <strstream.h>
-#else
#include <strstream>
-#endif
diff --git a/src/xalanc/Include/HPUXDefinitions.hpp b/src/xalanc/Include/HPUXDefinitions.hpp
index 4cc3098..c5ebda1 100644
--- a/src/xalanc/Include/HPUXDefinitions.hpp
+++ b/src/xalanc/Include/HPUXDefinitions.hpp
@@ -39,7 +39,6 @@
#if defined(RWSTD_MULTI_THREAD) && !defined(__HPACC_THREAD_SAFE_RB_TREE)
#define __HPACC_THREAD_SAFE_RB_TREE
#endif
-#define XALAN_CLASSIC_IOSTREAMS
#define XALAN_NO_STD_ALLOCATORS
#endif
diff --git a/src/xalanc/PlatformSupport/DOMStringHelper.cpp b/src/xalanc/PlatformSupport/DOMStringHelper.cpp
index 15469fd..9f0d8a9 100644
--- a/src/xalanc/PlatformSupport/DOMStringHelper.cpp
+++ b/src/xalanc/PlatformSupport/DOMStringHelper.cpp
@@ -35,11 +35,7 @@
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#else
#include <iostream>
-#endif
@@ -326,26 +322,19 @@
-using std::ostream;
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-typedef int streamsize;
-#else
-using std::streamsize;
-#endif
-
XALAN_PLATFORMSUPPORT_EXPORT_FUNCTION(void)
OutputString(
- ostream& theStream,
+ std::ostream& theStream,
const CharVectorType& theString)
{
if (theString.empty() == false)
{
assert(
- static_cast<XALAN_UINT64>(static_cast<streamsize>(theString.size())) == theString.size());
+ static_cast<XALAN_UINT64>(static_cast<std::streamsize>(theString.size())) == theString.size());
theStream.write(
&*theString.begin(),
- static_cast<streamsize>(theString.size()));
+ static_cast<std::streamsize>(theString.size()));
}
}
@@ -365,7 +354,7 @@
XALAN_PLATFORMSUPPORT_EXPORT_FUNCTION(void)
OutputString(
- ostream& theStream,
+ std::ostream& theStream,
const XalanDOMChar* theString,
MemoryManager& theMemoryManager)
{
diff --git a/src/xalanc/PlatformSupport/DOMStringHelper.hpp b/src/xalanc/PlatformSupport/DOMStringHelper.hpp
index 26ec76b..d92cb24 100644
--- a/src/xalanc/PlatformSupport/DOMStringHelper.hpp
+++ b/src/xalanc/PlatformSupport/DOMStringHelper.hpp
@@ -28,11 +28,7 @@
#include <algorithm>
#include <cassert>
#include <functional>
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-class ostream;
-#else
#include <iosfwd>
-#endif
diff --git a/src/xalanc/PlatformSupport/StdBinInputStream.cpp b/src/xalanc/PlatformSupport/StdBinInputStream.cpp
index 4d3da06..32503f5 100644
--- a/src/xalanc/PlatformSupport/StdBinInputStream.cpp
+++ b/src/xalanc/PlatformSupport/StdBinInputStream.cpp
@@ -21,9 +21,7 @@
#include <cassert>
-#if !defined(XALAN_CLASSIC_IOSTREAMS)
#include <iostream>
-#endif
@@ -70,13 +68,9 @@
assert(static_cast<XALAN_UINT64>(static_cast<streamsize>(maxToRead)) == maxToRead);
-#if !defined(XALAN_CLASSIC_IOSTREAMS)
m_stream.read(
reinterpret_cast<char*>(toFill),
static_cast<streamsize>(maxToRead));
-#else
- m_stream.read(toFill, maxToRead);
-#endif
return m_stream.gcount();
}
diff --git a/src/xalanc/PlatformSupport/StdBinInputStream.hpp b/src/xalanc/PlatformSupport/StdBinInputStream.hpp
index 3fc8165..b964910 100644
--- a/src/xalanc/PlatformSupport/StdBinInputStream.hpp
+++ b/src/xalanc/PlatformSupport/StdBinInputStream.hpp
@@ -26,11 +26,7 @@
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#else
#include <iosfwd>
-#endif
diff --git a/src/xalanc/PlatformSupport/XalanStdOutputStream.cpp b/src/xalanc/PlatformSupport/XalanStdOutputStream.cpp
index 7dbd7cb..a63d34f 100644
--- a/src/xalanc/PlatformSupport/XalanStdOutputStream.cpp
+++ b/src/xalanc/PlatformSupport/XalanStdOutputStream.cpp
@@ -24,9 +24,7 @@
-#if !defined(XALAN_CLASSIC_IOSTREAMS)
#include <iostream>
-#endif
diff --git a/src/xalanc/PlatformSupport/XalanStdOutputStream.hpp b/src/xalanc/PlatformSupport/XalanStdOutputStream.hpp
index f0b1a3e..c24c497 100644
--- a/src/xalanc/PlatformSupport/XalanStdOutputStream.hpp
+++ b/src/xalanc/PlatformSupport/XalanStdOutputStream.hpp
@@ -25,12 +25,8 @@
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#else
#include <iosfwd>
#include <ios>
-#endif
@@ -50,11 +46,7 @@
typedef std::ostream StreamType;
-#if defined(XALAN_CLASSIC_IOSTREAMS)
- typedef int StreamSizeType;
-#else
typedef std::streamsize StreamSizeType;
-#endif
/**
* Construct a XalanStdOutputStream instance for output to the
diff --git a/src/xalanc/TestXPath/TestXPath.cpp b/src/xalanc/TestXPath/TestXPath.cpp
index eeb3afe..721c3b3 100644
--- a/src/xalanc/TestXPath/TestXPath.cpp
+++ b/src/xalanc/TestXPath/TestXPath.cpp
@@ -27,11 +27,7 @@
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#else
#include <iostream>
-#endif
diff --git a/src/xalanc/TestXSLT/process.cpp b/src/xalanc/TestXSLT/process.cpp
index a6855cf..52868a0 100644
--- a/src/xalanc/TestXSLT/process.cpp
+++ b/src/xalanc/TestXSLT/process.cpp
@@ -24,11 +24,7 @@
#include <cstring>
#include <algorithm>
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#else
#include <iostream>
-#endif
diff --git a/src/xalanc/Utils/MsgCreator/MsgCreator.hpp b/src/xalanc/Utils/MsgCreator/MsgCreator.hpp
index 15e03fc..834896a 100644
--- a/src/xalanc/Utils/MsgCreator/MsgCreator.hpp
+++ b/src/xalanc/Utils/MsgCreator/MsgCreator.hpp
@@ -27,11 +27,7 @@
#include <cstring>
#include <cstdlib>
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#else
#include <iostream>
-#endif
using namespace xercesc;
@@ -78,11 +74,7 @@
char* fLocalForm;
};
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-inline ostream& operator<<(ostream& target, const StrX& toDump)
-#else
inline std::ostream& operator<<(std::ostream& target, const StrX& toDump)
-#endif
{
target << toDump.localForm();
return target;
diff --git a/src/xalanc/XPath/XPathConstructionContextDefault.cpp b/src/xalanc/XPath/XPathConstructionContextDefault.cpp
index b11fbbd..53ab0c6 100644
--- a/src/xalanc/XPath/XPathConstructionContextDefault.cpp
+++ b/src/xalanc/XPath/XPathConstructionContextDefault.cpp
@@ -20,11 +20,7 @@
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#else
#include <iostream>
-#endif
diff --git a/src/xalanc/XPath/XPathEnvSupportDefault.cpp b/src/xalanc/XPath/XPathEnvSupportDefault.cpp
index bd324a9..8b34db2 100644
--- a/src/xalanc/XPath/XPathEnvSupportDefault.cpp
+++ b/src/xalanc/XPath/XPathEnvSupportDefault.cpp
@@ -24,11 +24,7 @@
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#else
#include <iostream>
-#endif
diff --git a/src/xalanc/XPath/XPathExpression.cpp b/src/xalanc/XPath/XPathExpression.cpp
index 1d23a1d..2154f98 100644
--- a/src/xalanc/XPath/XPathExpression.cpp
+++ b/src/xalanc/XPath/XPathExpression.cpp
@@ -25,11 +25,7 @@
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#else
#include <ostream>
-#endif
diff --git a/src/xalanc/XPath/XPathExpression.hpp b/src/xalanc/XPath/XPathExpression.hpp
index 22ba14d..2466b0b 100644
--- a/src/xalanc/XPath/XPathExpression.hpp
+++ b/src/xalanc/XPath/XPathExpression.hpp
@@ -29,11 +29,7 @@
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#else
#include <iosfwd>
-#endif
diff --git a/src/xalanc/XSLT/XSLTInputSource.cpp b/src/xalanc/XSLT/XSLTInputSource.cpp
index b127cac..88b0620 100644
--- a/src/xalanc/XSLT/XSLTInputSource.cpp
+++ b/src/xalanc/XSLT/XSLTInputSource.cpp
@@ -22,9 +22,7 @@
#include <cassert>
-#if !defined(XALAN_CLASSIC_IOSTREAMS)
#include <istream>
-#endif
diff --git a/src/xalanc/XSLT/XSLTInputSource.hpp b/src/xalanc/XSLT/XSLTInputSource.hpp
index 6a84557..90a159c 100644
--- a/src/xalanc/XSLT/XSLTInputSource.hpp
+++ b/src/xalanc/XSLT/XSLTInputSource.hpp
@@ -26,11 +26,7 @@
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#else
#include <iosfwd>
-#endif
diff --git a/src/xalanc/XSLT/XSLTResultTarget.cpp b/src/xalanc/XSLT/XSLTResultTarget.cpp
index 2d9dd4b..d4ffc5d 100644
--- a/src/xalanc/XSLT/XSLTResultTarget.cpp
+++ b/src/xalanc/XSLT/XSLTResultTarget.cpp
@@ -23,11 +23,7 @@
#include <cassert>
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#else
#include <ostream>
-#endif
diff --git a/src/xalanc/XSLT/XSLTResultTarget.hpp b/src/xalanc/XSLT/XSLTResultTarget.hpp
index cf9e4c7..ab23fdc 100644
--- a/src/xalanc/XSLT/XSLTResultTarget.hpp
+++ b/src/xalanc/XSLT/XSLTResultTarget.hpp
@@ -25,11 +25,7 @@
#include <cstdio>
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-class ostream;
-#else
#include <iosfwd>
-#endif
diff --git a/src/xalanc/XalanExe/XalanExe.cpp b/src/xalanc/XalanExe/XalanExe.cpp
index 6efc1c5..2d9703b 100644
--- a/src/xalanc/XalanExe/XalanExe.cpp
+++ b/src/xalanc/XalanExe/XalanExe.cpp
@@ -22,11 +22,7 @@
#include <cstdlib>
#include <cstring>
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#else
#include <iostream>
-#endif
diff --git a/src/xalanc/XalanTransformer/XalanCAPI.cpp b/src/xalanc/XalanTransformer/XalanCAPI.cpp
index 85f2214..4908d8d 100644
--- a/src/xalanc/XalanTransformer/XalanCAPI.cpp
+++ b/src/xalanc/XalanTransformer/XalanCAPI.cpp
@@ -20,11 +20,7 @@
#include <xercesc/util/PlatformUtils.hpp>
#include <cassert>
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <strstream.h>
-#else
#include <strstream>
-#endif
#include "XalanCAPI.h"
#include "XalanTransformer.hpp"
diff --git a/src/xalanc/XalanTransformer/XalanTransformer.cpp b/src/xalanc/XalanTransformer/XalanTransformer.cpp
index 7121244..94e9fc5 100644
--- a/src/xalanc/XalanTransformer/XalanTransformer.cpp
+++ b/src/xalanc/XalanTransformer/XalanTransformer.cpp
@@ -18,11 +18,7 @@
#include "XalanTransformer.hpp"
#include <algorithm>
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#else
#include <iostream>
-#endif
diff --git a/src/xalanc/XalanTransformer/XalanTransformer.hpp b/src/xalanc/XalanTransformer/XalanTransformer.hpp
index e9a6c2d..b07caa3 100644
--- a/src/xalanc/XalanTransformer/XalanTransformer.hpp
+++ b/src/xalanc/XalanTransformer/XalanTransformer.hpp
@@ -25,11 +25,7 @@
#include <cassert>
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-class ostream;
-#else
#include <iosfwd>
-#endif
#include <algorithm>
diff --git a/src/xalanc/XalanTransformer/XalanTransformerProblemListener.cpp b/src/xalanc/XalanTransformer/XalanTransformerProblemListener.cpp
index 1dce4a8..9bb527f 100644
--- a/src/xalanc/XalanTransformer/XalanTransformerProblemListener.cpp
+++ b/src/xalanc/XalanTransformer/XalanTransformerProblemListener.cpp
@@ -23,11 +23,7 @@
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#else
#include <ostream>
-#endif
diff --git a/src/xalanc/XalanTransformer/XalanTransformerProblemListener.hpp b/src/xalanc/XalanTransformer/XalanTransformerProblemListener.hpp
index 4e28ce2..8adbca6 100644
--- a/src/xalanc/XalanTransformer/XalanTransformerProblemListener.hpp
+++ b/src/xalanc/XalanTransformer/XalanTransformerProblemListener.hpp
@@ -26,11 +26,7 @@
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-class ostream;
-#else
#include <iosfwd>
-#endif
diff --git a/src/xalanc/XercesParserLiaison/XercesParserLiaison.cpp b/src/xalanc/XercesParserLiaison/XercesParserLiaison.cpp
index 38af0f7..9ba996e 100644
--- a/src/xalanc/XercesParserLiaison/XercesParserLiaison.cpp
+++ b/src/xalanc/XercesParserLiaison/XercesParserLiaison.cpp
@@ -19,11 +19,7 @@
-#if defined(XALAN_CLASSIC_IOSTREAMS)
-#include <iostream.h>
-#else
#include <iostream>
-#endif
