Author: carnold
Date: Wed Apr 26 12:18:49 2006
New Revision: 397276
URL: http://svn.apache.org/viewcvs?rev=397276&view=rev
Log:
Bug LOGCXX-125: Broken multiple inclusion guard, header check workaround
Modified:
logging/log4cxx/trunk/include/log4cxx/helpers/bytearrayinputstream.h
Modified: logging/log4cxx/trunk/include/log4cxx/helpers/bytearrayinputstream.h
URL:
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/include/log4cxx/helpers/bytearrayinputstream.h?rev=397276&r1=397275&r2=397276&view=diff
==============================================================================
--- logging/log4cxx/trunk/include/log4cxx/helpers/bytearrayinputstream.h
(original)
+++ logging/log4cxx/trunk/include/log4cxx/helpers/bytearrayinputstream.h Wed
Apr 26 12:18:49 2006
@@ -15,7 +15,7 @@
*/
#ifndef _LOG4CXX_HELPERS_BYTEARRAYINPUTSTREAM_H
-#define _LOG4CXX_HELPERS_BYTEARRAYNPUTSTREAM_H
+#define _LOG4CXX_HELPERS_BYTEARRAYINPUTSTREAM_H
#include <vector>
#include <log4cxx/helpers/inputstream.h>
@@ -33,9 +33,8 @@
class LOG4CXX_EXPORT ByteArrayInputStream : public InputStream
{
private:
- typedef std::vector<unsigned char> ByteArray;
- ByteArray buf;
- ByteArray::size_type pos;
+ std::vector<unsigned char> buf;
+ size_t pos;
public:
DECLARE_ABSTRACT_LOG4CXX_OBJECT(ByteArrayInputStream)
