diff options
author | 2016-03-05 17:11:04 +0100 | |
---|---|---|
committer | 2016-03-14 20:24:29 +0100 | |
commit | 41c8a9f6fa49b10c021196463adc654ecce25790 (patch) | |
tree | 2e59db2aa4d0730711e7e0a9541905b2f6380479 /src/lib/netlist/plib/pstream.cpp | |
parent | 0e48eb2a4392df8dd020f42432d90f614d73c6b3 (diff) |
netlist updates:
- First steps to move towards c++11.
- Base plist on std::vector
- Replace pstack with std::stack
- Remove pnamed_list
- use c++ "for each" in a number of places
- Fixed two "time bombs"
[couriersud]
Diffstat (limited to 'src/lib/netlist/plib/pstream.cpp')
-rw-r--r-- | src/lib/netlist/plib/pstream.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/netlist/plib/pstream.cpp b/src/lib/netlist/plib/pstream.cpp index ba7c5c7eda2..9702ab5dab5 100644 --- a/src/lib/netlist/plib/pstream.cpp +++ b/src/lib/netlist/plib/pstream.cpp @@ -101,7 +101,7 @@ void pifilestream::close() } } -unsigned pifilestream::vread(void *buf, unsigned n) +unsigned pifilestream::vread(void *buf, const unsigned n) { std::size_t r = fread(buf, 1, n, (FILE *) m_file); if (r < n) @@ -115,7 +115,7 @@ unsigned pifilestream::vread(void *buf, unsigned n) return r; } -void pifilestream::vseek(pos_type n) +void pifilestream::vseek(const pos_type n) { check_seekable(); if (fseek((FILE *) m_file, SEEK_SET, n) < 0) @@ -200,7 +200,7 @@ void pofilestream::close() } } -void pofilestream::vwrite(const void *buf, unsigned n) +void pofilestream::vwrite(const void *buf, const unsigned n) { std::size_t r = fwrite(buf, 1, n, (FILE *) m_file); if (r < n) @@ -211,7 +211,7 @@ void pofilestream::vwrite(const void *buf, unsigned n) m_pos += r; } -void pofilestream::vseek(pos_type n) +void pofilestream::vseek(const pos_type n) { check_seekable(); if (fseek((FILE *) m_file, SEEK_SET, n) < 0) @@ -271,7 +271,7 @@ pimemstream::~pimemstream() { } -unsigned pimemstream::vread(void *buf, unsigned n) +unsigned pimemstream::vread(void *buf, const unsigned n) { unsigned ret = (m_pos + n <= m_len) ? n : m_len - m_pos; @@ -287,7 +287,7 @@ unsigned pimemstream::vread(void *buf, unsigned n) return ret; } -void pimemstream::vseek(pos_type n) +void pimemstream::vseek(const pos_type n) { m_pos = (n>=m_len) ? m_len : n; clear_flag(FLAG_EOF); @@ -314,7 +314,7 @@ pomemstream::~pomemstream() pfree_array(m_mem); } -void pomemstream::vwrite(const void *buf, unsigned n) +void pomemstream::vwrite(const void *buf, const unsigned n) { if (m_pos + n >= m_capacity) { @@ -336,7 +336,7 @@ void pomemstream::vwrite(const void *buf, unsigned n) m_size = std::max(m_pos, m_size); } -void pomemstream::vseek(pos_type n) +void pomemstream::vseek(const pos_type n) { m_pos = n; m_size = std::max(m_pos, m_size); |