diff options
author | 2016-03-18 19:22:43 +1100 | |
---|---|---|
committer | 2016-03-18 19:32:10 +1100 | |
commit | 100fa28671af455853a6de1b2d7a3499fa6e185c (patch) | |
tree | e1d89e396fc7bc33b5c3b7b075f8138f9396ce3f /src/lib/util/corefile.cpp | |
parent | acb27808d4f00b09958e5898966d7917b1debf1a (diff) |
* Remove confusing method from vectorstreams that hide base_ios method (fixes disassembly view)
* Allow std::string to pass through core_file unmolested (reduces temporary allocations)
* Make zip/7z instances of same class with uniform interface
* zippath browsing is broken at the moment
This is another step towards transparent archive support. It's now
possible to access zip and 7z archives with the same code. Nothing is
taking advantage of it yet. There's now some very similar code in
fileio.cpp and clifront.cpp that could be folded at some point.
Diffstat (limited to 'src/lib/util/corefile.cpp')
-rw-r--r-- | src/lib/util/corefile.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/util/corefile.cpp b/src/lib/util/corefile.cpp index 5c16d886fe3..e3d34ec3738 100644 --- a/src/lib/util/corefile.cpp +++ b/src/lib/util/corefile.cpp @@ -1084,7 +1084,7 @@ osd_file::error core_osd_file::osd_or_zlib_write(void const *buffer, std::uint64 return an error code -------------------------------------------------*/ -osd_file::error core_file::open(char const *filename, std::uint32_t openflags, ptr &file) +osd_file::error core_file::open(std::string const &filename, std::uint32_t openflags, ptr &file) { try { @@ -1190,7 +1190,7 @@ core_file::~core_file() pointer -------------------------------------------------*/ -osd_file::error core_file::load(char const *filename, void **data, std::uint32_t &length) +osd_file::error core_file::load(std::string const &filename, void **data, std::uint32_t &length) { ptr file; @@ -1219,7 +1219,7 @@ osd_file::error core_file::load(char const *filename, void **data, std::uint32_t return osd_file::error::NONE; } -osd_file::error core_file::load(char const *filename, dynamic_buffer &data) +osd_file::error core_file::load(std::string const &filename, dynamic_buffer &data) { ptr file; |