diff options
| author | Jose <jose@zeroc.com> | 2015-02-17 17:08:54 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2015-02-17 17:08:54 +0100 |
| commit | 21c1ba295bc813f35a638b3867234c63dac1816e (patch) | |
| tree | d4e82f25daf0030375094f734cf4c5ad2d55fdf2 /cpp/src/IcePatch2/FileServerI.h | |
| parent | ICE-6306 added checks to javascript for byte/short/int (diff) | |
| download | ice-21c1ba295bc813f35a638b3867234c63dac1816e.tar.bz2 ice-21c1ba295bc813f35a638b3867234c63dac1816e.tar.xz ice-21c1ba295bc813f35a638b3867234c63dac1816e.zip | |
Fixed (ICE-5740) - IcePatch2 has issues with 'large' files.
Diffstat (limited to 'cpp/src/IcePatch2/FileServerI.h')
| -rw-r--r-- | cpp/src/IcePatch2/FileServerI.h | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/cpp/src/IcePatch2/FileServerI.h b/cpp/src/IcePatch2/FileServerI.h index ca78be38d34..df4c7cf7a45 100644 --- a/cpp/src/IcePatch2/FileServerI.h +++ b/cpp/src/IcePatch2/FileServerI.h @@ -10,7 +10,7 @@ #ifndef ICE_PATCH2_FILE_SERVER_I_H #define ICE_PATCH2_FILE_SERVER_I_H -#include <IcePatch2/Util.h> +#include <IcePatch2Lib/Util.h> #include <IcePatch2/FileServer.h> namespace IcePatch2 @@ -20,21 +20,40 @@ class FileServerI : public FileServer { public: - FileServerI(const std::string&, const FileInfoSeq&); + FileServerI(const std::string&, const LargeFileInfoSeq&); FileInfoSeq getFileInfoSeq(Ice::Int, const Ice::Current&) const; + + LargeFileInfoSeq + getLargeFileInfoSeq(Ice::Int, const Ice::Current&) const; ByteSeqSeq getChecksumSeq(const Ice::Current&) const; Ice::ByteSeq getChecksum(const Ice::Current&) const; - void getFileCompressed_async(const AMD_FileServer_getFileCompressedPtr&, const std::string&, Ice::Int pos, - Ice::Int num, const Ice::Current&) const; + void getFileCompressed_async(const AMD_FileServer_getFileCompressedPtr&, + const std::string&, + Ice::Int, + Ice::Int, + const Ice::Current&) const; + + void getLargeFileCompressed_async(const AMD_FileServer_getLargeFileCompressedPtr&, + const std::string&, + Ice::Long, + Ice::Int, + const Ice::Current&) const; private: + + void + getFileCompressedInternal(const std::string&, + Ice::Long, + Ice::Int, + std::vector<Ice::Byte>&, + bool) const; const std::string _dataDir; - const FileTree0 _tree0; + const IcePatch2Internal::FileTree0 _tree0; }; } |