diff options
| author | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2012-09-01 10:04:05 -0700 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2012-09-01 10:27:52 -0700 |
| commit | 4a893f72cadaa875a920db8949171b002f656e43 (patch) | |
| tree | 1e08a3cb6f579cab9c3c9a138d36ababdf76121b /src/BStream.cc | |
| parent | 56d91ddd2cd42b782cde0bb3fdf4eb9ebe7597be (diff) | |
| parent | 06674e57649d536cf19715524ee40c5ad4a9026d (diff) | |
Merge commit '06674e57649d536cf19715524ee40c5ad4a9026d'
Conflicts:
includes/LuaTask.h
includes/TaskMan.h
includes/Threads.h
src/TaskMan.cc
src/Threads.cc
Diffstat (limited to 'src/BStream.cc')
| -rw-r--r-- | src/BStream.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/BStream.cc b/src/BStream.cc index 9420459..6c51c4f 100644 --- a/src/BStream.cc +++ b/src/BStream.cc @@ -3,7 +3,7 @@ static const int s_blockSize = 16 * 1024; -Balau::BStream::BStream(const IO<Handle> & h) : m_h(h), m_buffer((uint8_t *) malloc(s_blockSize)), m_availBytes(0), m_cursor(0), m_passThru(false) { +Balau::BStream::BStream(const IO<Handle> & h) : m_h(h), m_buffer((uint8_t *) malloc(s_blockSize)) { AAssert(m_h->canRead(), "You can't create a buffered stream with a Handle that can't read"); m_name.set("Stream(%s)", m_h->getName()); if ((m_h.isA<Buffer>()) || (m_h.isA<BStream>())) |