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/Server.cpp | |
| 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/Server.cpp')
| -rw-r--r-- | cpp/src/IcePatch2/Server.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cpp/src/IcePatch2/Server.cpp b/cpp/src/IcePatch2/Server.cpp index e2ff5a61a6b..89f2f0454ef 100644 --- a/cpp/src/IcePatch2/Server.cpp +++ b/cpp/src/IcePatch2/Server.cpp @@ -10,13 +10,15 @@ #include <IceUtil/Options.h> #include <IceUtil/StringUtil.h> #include <IceUtil/FileUtil.h> +#include <IceUtil/DisableWarnings.h> #include <Ice/Service.h> #include <IcePatch2/FileServerI.h> -#include <IcePatch2/Util.h> +#include <IcePatch2Lib/Util.h> using namespace std; using namespace Ice; using namespace IcePatch2; +using namespace IcePatch2Internal; namespace IcePatch2 { @@ -96,7 +98,7 @@ IcePatch2::PatcherService::start(int argc, char* argv[], int& status) return false; } - FileInfoSeq infoSeq; + LargeFileInfoSeq infoSeq; try { |