generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-12-11 12:07:23 +01:00
Code Issues Projects Releases Wiki Activity

Restored original names for typedefs. Fixed gcc build.

Browse Source
This commit is contained in:
martin-osborne
2015-01-25 07:28:24 +00:00
parent 5e104addd3
commit c264a0d716
1 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Foundation/include/Poco/MemoryStream.h
View File

@@ -32,8 +32,8 @@
namespace Poco { namespace Poco {
template <typename charT, typename traits> template <typename ch, typename tr>
class BasicMemoryStreamBuf: public std::basic_streambuf<charT, traits> class BasicMemoryStreamBuf: public std::basic_streambuf<ch, tr>
/// BasicMemoryStreamBuf is a simple implementation of a /// BasicMemoryStreamBuf is a simple implementation of a
/// stream buffer for reading and writing from a memory area. /// stream buffer for reading and writing from a memory area.
/// ///
@@ -43,11 +43,13 @@ class BasicMemoryStreamBuf: public std::basic_streambuf<charT, traits>
/// ostream, but not for an iostream. /// ostream, but not for an iostream.
{ {
protected: protected:
typedef charT char_type; typedef std::basic_streambuf<ch, tr> Base;
typedef typename traits::int_type int_type; typedef std::basic_ios<ch, tr> IOS;
typedef typename traits::pos_type pos_type; typedef ch char_type;
typedef typename traits::off_type off_type; typedef tr char_traits;
typedef traits traits_type; typedef typename Base::int_type int_type;
typedef typename Base::pos_type pos_type;
typedef typename Base::off_type off_type;
public: public:
BasicMemoryStreamBuf(char_type* pBuffer, std::streamsize bufferSize): BasicMemoryStreamBuf(char_type* pBuffer, std::streamsize bufferSize):
@@ -64,12 +66,12 @@ public:
virtual int_type overflow(int_type /*c*/) virtual int_type overflow(int_type /*c*/)
{ {
return traits_type::eof(); return char_traits::eof();
} }
virtual int_type underflow() virtual int_type underflow()
{ {
return traits_type::eof(); return char_traits::eof();
} }
virtual pos_type seekoff(off_type off, std::ios_base::seekdir way, std::ios_base::openmode which = std::ios_base::in | std::ios_base::out) virtual pos_type seekoff(off_type off, std::ios_base::seekdir way, std::ios_base::openmode which = std::ios_base::in | std::ios_base::out)
@@ -81,7 +83,7 @@ public:
{ {
// Position the input sequence // Position the input sequence
if (gptr() == 0) if (this->gptr() == 0)
return fail; return fail;
switch (way) switch (way)
@@ -93,21 +95,21 @@ public:
// cur is not valid if both in and out are specified (Condition 3) // cur is not valid if both in and out are specified (Condition 3)
if ((which & std::ios_base::out) != 0) if ((which & std::ios_base::out) != 0)
return fail; return fail;
newoff = gptr() - eback(); newoff = this->gptr() - this->eback();
break; break;
case std::ios_base::end: case std::ios_base::end:
newoff = egptr() - eback(); newoff = this->egptr() - this->eback();
break; break;
} }
if ((newoff + off) < 0 || (egptr() - eback()) < (newoff + off)) if ((newoff + off) < 0 || (this->egptr() - this->eback()) < (newoff + off))
return fail; return fail;
this->setg(eback(), eback() + newoff + off, egptr()); this->setg(this->eback(), this->eback() + newoff + off, this->egptr());
} }
if ((which & std::ios_base::out) != 0) if ((which & std::ios_base::out) != 0)
{ {
if (pptr() == 0) if (this->pptr() == 0)
return fail; return fail;
switch (way) switch (way)
@@ -119,16 +121,16 @@ public:
// cur is not valid if both in and out are specified (Condition 3) // cur is not valid if both in and out are specified (Condition 3)
if ((which & std::ios_base::in) != 0) if ((which & std::ios_base::in) != 0)
return fail; return fail;
newoff = pptr() - pbase(); newoff = this->pptr() - this->pbase();
break; break;
case std::ios_base::end: case std::ios_base::end:
newoff = epptr() - pbase(); newoff = this->epptr() - this->pbase();
break; break;
} }
if (newoff + off < 0 || (epptr() - pbase()) < newoff + off) if (newoff + off < 0 || (this->epptr() - this->pbase()) < newoff + off)
return fail; return fail;
this->pbump((int)(newoff + off - (pptr() - pbase()))); this->pbump((int)(newoff + off - (this->pptr() - this->pbase())));
} }
return newoff; return newoff;