dbertoni 2002/10/02 22:23:45
Modified: c/src/PlatformSupport StdBinInputStream.cpp
StdBinInputStream.hpp
Log:
Fix for bug 13190.
Revision Changes Path
1.18 +3 -30 xml-xalan/c/src/PlatformSupport/StdBinInputStream.cpp
Index: StdBinInputStream.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/StdBinInputStream.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- StdBinInputStream.cpp 3 Oct 2002 01:30:30 -0000 1.17
+++ StdBinInputStream.cpp 3 Oct 2002 05:23:45 -0000 1.18
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -84,8 +84,7 @@
istream& theStream,
bool fBlockingRead) :
BinInputStream(),
- m_stream(theStream),
- m_blockingRead(&m_stream == &cin ? true : fBlockingRead)
+ m_stream(theStream)
{
}
@@ -116,30 +115,6 @@
{
return 0;
}
-#if 0
- else if (m_blockingRead == true)
- {
- unsigned int i = 0;
-
- while(i < maxToRead)
- {
- const int ch = m_stream.get();
-
- if (ch == EOF)
- {
- break;
- }
- else
- {
- toFill[i] = XMLByte(ch);
-
- ++i;
- }
- }
-
- return i;
- }
-#endif
else
{
#if !defined(XALAN_OLD_STREAM_HEADERS)
@@ -148,12 +123,10 @@
#else
m_stream.read(reinterpret_cast<char*>(toFill), maxToRead);
#endif
-
- return m_stream.gcount();
#else
m_stream.read(toFill, maxToRead);
+#endif
return m_stream.gcount();
-#endif
}
}
1.9 +1 -3 xml-xalan/c/src/PlatformSupport/StdBinInputStream.hpp
Index: StdBinInputStream.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/StdBinInputStream.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- StdBinInputStream.hpp 23 Aug 2002 21:31:42 -0000 1.8
+++ StdBinInputStream.hpp 3 Oct 2002 05:23:45 -0000 1.9
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -123,8 +123,6 @@
#else
std::istream& m_stream;
#endif
-
- const bool m_blockingRead;
};
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
