summaryrefslogtreecommitdiff
path: root/cpp/src/IcePatch2/Client.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2015-02-17 17:08:54 +0100
committerJose <jose@zeroc.com>2015-02-17 17:08:54 +0100
commit21c1ba295bc813f35a638b3867234c63dac1816e (patch)
treed4e82f25daf0030375094f734cf4c5ad2d55fdf2 /cpp/src/IcePatch2/Client.cpp
parentICE-6306 added checks to javascript for byte/short/int (diff)
downloadice-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/Client.cpp')
-rw-r--r--cpp/src/IcePatch2/Client.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/IcePatch2/Client.cpp b/cpp/src/IcePatch2/Client.cpp
index 347d1e1c8f6..8ef166ab0d0 100644
--- a/cpp/src/IcePatch2/Client.cpp
+++ b/cpp/src/IcePatch2/Client.cpp
@@ -10,7 +10,7 @@
#include <IceUtil/Options.h>
#include <IceUtil/StringUtil.h>
#include <Ice/Application.h>
-#include <IcePatch2/Util.h>
+#include <IcePatch2Lib/Util.h>
#include <IcePatch2/ClientUtil.h>
#ifdef _WIN32
@@ -23,6 +23,7 @@
using namespace std;
using namespace Ice;
using namespace IcePatch2;
+using namespace IcePatch2Internal;
class TextPatcherFeedback : public PatcherFeedback
{
@@ -282,7 +283,7 @@ Client::run(int argc, char* argv[])
try
{
PatcherFeedbackPtr feedback = new TextPatcherFeedback;
- PatcherPtr patcher = new Patcher(communicator(), feedback);
+ PatcherPtr patcher = PatcherFactory::create(communicator(), feedback);
aborted = !patcher->prepare();