From 1845c028b8cb8496d1d78f0da738120e1c31401a Mon Sep 17 00:00:00 2001 From: Daniel Wilhelm Date: Fri, 2 Oct 2015 14:52:04 +0200 Subject: 6.8 --- zen/serialize.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'zen/serialize.h') diff --git a/zen/serialize.h b/zen/serialize.h index 9a14e6af..64df0329 100644 --- a/zen/serialize.h +++ b/zen/serialize.h @@ -8,8 +8,8 @@ #define SERIALIZE_H_INCLUDED_83940578357 #include -#include -#include +#include "string_base.h" +#include "file_io.h" namespace zen { @@ -54,8 +54,8 @@ private: //---------------------------------------------------------------------- //functions based on binary container abstraction -template void saveBinStream(const Zstring& filename, const BinContainer& cont); //throw FileError -template BinContainer loadBinStream(const Zstring& filename); //throw FileError +template void saveBinStream(const Zstring& filepath, const BinContainer& cont); //throw FileError +template BinContainer loadBinStream(const Zstring& filepath); //throw FileError /* @@ -135,22 +135,22 @@ template < class BinInputStream> void readArray (BinInputStream& stre //-----------------------implementation------------------------------- template inline -void saveBinStream(const Zstring& filename, const BinContainer& cont) //throw FileError +void saveBinStream(const Zstring& filepath, const BinContainer& cont) //throw FileError { assert_static(sizeof(typename BinContainer::value_type) == 1); //expect: bytes (until further) - FileOutput fileOut(filename, zen::FileOutput::ACC_OVERWRITE); //throw FileError + FileOutput fileOut(filepath, zen::FileOutput::ACC_OVERWRITE); //throw FileError if (!cont.empty()) fileOut.write(&*cont.begin(), cont.size()); //throw FileError } template inline -BinContainer loadBinStream(const Zstring& filename) //throw FileError +BinContainer loadBinStream(const Zstring& filepath) //throw FileError { assert_static(sizeof(typename BinContainer::value_type) == 1); //expect: bytes (until further) - FileInput fileIn(filename); //throw FileError + FileInput fileIn(filepath); //throw FileError BinContainer contOut; const size_t blockSize = 128 * 1024; -- cgit