Fixed (ICE-5740) - IcePatch2 has issues with 'large' files.

6 files changed, 35 insertions, 35 deletions

diff --git a/cpp/demo/Freeze/library/.depend.mak b/cpp/demo/Freeze/library/.depend.mak
index 26cb39fdded..6325336de36 100755
--- a/cpp/demo/Freeze/library/.depend.mak
+++ b/cpp/demo/Freeze/library/.depend.mak
@@ -198,8 +198,8 @@ Client.obj: \
     "Parser.h" \
     "Library.h" \
 
-Grammar.obj: \
-	Grammar.cpp \
+Parser.obj: \
+	Parser.cpp \
     "Parser.h" \
     "$(includedir)\Ice\Ice.h" \
     "$(includedir)\IceUtil\PushDisableWarnings.h" \
@@ -316,8 +316,8 @@ Grammar.obj: \
     "$(includedir)\Ice\Service.h" \
     "Library.h" \
 
-Parser.obj: \
-	Parser.cpp \
+RunParser.obj: \
+	RunParser.cpp \
     "Parser.h" \
     "$(includedir)\Ice\Ice.h" \
     "$(includedir)\IceUtil\PushDisableWarnings.h" \
@@ -434,11 +434,11 @@ Parser.obj: \
     "$(includedir)\Ice\Service.h" \
     "Library.h" \
 
-RunParser.obj: \
-	RunParser.cpp \
+Grammar.obj: \
+	Grammar.cpp \
+    "$(includedir)\IceUtil\PushDisableWarnings.h" \
     "Parser.h" \
     "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
     "$(includedir)\Ice\Config.h" \
     "$(includedir)\IceUtil\Config.h" \
     "$(includedir)\Ice\DeprecatedStringConverter.h" \
@@ -556,9 +556,9 @@ Scanner.obj: \
 	Scanner.cpp \
     "$(includedir)\IceUtil\ScannerConfig.h" \
     "$(includedir)\IceUtil\Config.h" \
+    "$(includedir)\IceUtil\PushDisableWarnings.h" \
     "Parser.h" \
     "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
     "$(includedir)\Ice\Config.h" \
     "$(includedir)\Ice\DeprecatedStringConverter.h" \
     "$(includedir)\Ice\CommunicatorF.h" \
diff --git a/cpp/demo/Freeze/phonebook/.depend.mak b/cpp/demo/Freeze/phonebook/.depend.mak
index 811ec46b4a5..1071719e8f4 100755
--- a/cpp/demo/Freeze/phonebook/.depend.mak
+++ b/cpp/demo/Freeze/phonebook/.depend.mak
@@ -199,8 +199,8 @@ Client.obj: \
     "$(includedir)\Ice\Service.h" \
     "PhoneBook.h" \
 
-Grammar.obj: \
-	Grammar.cpp \
+Parser.obj: \
+	Parser.cpp \
     "Parser.h" \
     "$(includedir)\Ice\Ice.h" \
     "$(includedir)\IceUtil\PushDisableWarnings.h" \
@@ -317,8 +317,8 @@ Grammar.obj: \
     "$(includedir)\Ice\Service.h" \
     "PhoneBook.h" \
 
-Parser.obj: \
-	Parser.cpp \
+RunParser.obj: \
+	RunParser.cpp \
     "Parser.h" \
     "$(includedir)\Ice\Ice.h" \
     "$(includedir)\IceUtil\PushDisableWarnings.h" \
@@ -435,11 +435,11 @@ Parser.obj: \
     "$(includedir)\Ice\Service.h" \
     "PhoneBook.h" \
 
-RunParser.obj: \
-	RunParser.cpp \
+Grammar.obj: \
+	Grammar.cpp \
+    "$(includedir)\IceUtil\PushDisableWarnings.h" \
     "Parser.h" \
     "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
     "$(includedir)\Ice\Config.h" \
     "$(includedir)\IceUtil\Config.h" \
     "$(includedir)\Ice\DeprecatedStringConverter.h" \
@@ -557,9 +557,9 @@ Scanner.obj: \
 	Scanner.cpp \
     "$(includedir)\IceUtil\ScannerConfig.h" \
     "$(includedir)\IceUtil\Config.h" \
+    "$(includedir)\IceUtil\PushDisableWarnings.h" \
     "Parser.h" \
     "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
     "$(includedir)\Ice\Config.h" \
     "$(includedir)\Ice\DeprecatedStringConverter.h" \
     "$(includedir)\Ice\CommunicatorF.h" \
diff --git a/cpp/demo/IcePatch2/MFC/PatchClientDlg.cpp b/cpp/demo/IcePatch2/MFC/PatchClientDlg.cpp
index 8dafedc7dd1..a77bc4aafc5 100644
--- a/cpp/demo/IcePatch2/MFC/PatchClientDlg.cpp
+++ b/cpp/demo/IcePatch2/MFC/PatchClientDlg.cpp
@@ -414,7 +414,7 @@ CPatchDlg::OnStartPatch()
         properties->setProperty("IcePatch2Client.Remove", remove);
 
         DialogPatcherFeedbackPtr feedback = new DialogPatcherFeedback(this);
-        IcePatch2::PatcherPtr patcher = new IcePatch2::Patcher(_communicator, feedback);
+        IcePatch2::PatcherPtr patcher = IcePatch2::PatcherFactory::create(_communicator, feedback);
 
         //
         // Disable a few controls during the patch process.
diff --git a/cpp/demo/Manual/evictor_filesystem/.depend.mak b/cpp/demo/Manual/evictor_filesystem/.depend.mak
index 50006e9f5c3..510e63e9c84 100755
--- a/cpp/demo/Manual/evictor_filesystem/.depend.mak
+++ b/cpp/demo/Manual/evictor_filesystem/.depend.mak
@@ -202,8 +202,8 @@ Client.obj: \
     "Filesystem.h" \
     "Parser.h" \
 
-Grammar.obj: \
-	Grammar.cpp \
+Parser.obj: \
+	Parser.cpp \
     "Parser.h" \
     "$(includedir)\Ice\Ice.h" \
     "$(includedir)\IceUtil\PushDisableWarnings.h" \
@@ -320,11 +320,11 @@ Grammar.obj: \
     "$(includedir)\Ice\Service.h" \
     "Filesystem.h" \
 
-Parser.obj: \
-	Parser.cpp \
+Grammar.obj: \
+	Grammar.cpp \
+    "$(includedir)\IceUtil\PushDisableWarnings.h" \
     "Parser.h" \
     "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
     "$(includedir)\Ice\Config.h" \
     "$(includedir)\IceUtil\Config.h" \
     "$(includedir)\Ice\DeprecatedStringConverter.h" \
@@ -442,9 +442,9 @@ Scanner.obj: \
 	Scanner.cpp \
     "$(includedir)\IceUtil\ScannerConfig.h" \
     "$(includedir)\IceUtil\Config.h" \
+    "$(includedir)\IceUtil\PushDisableWarnings.h" \
     "Parser.h" \
     "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
     "$(includedir)\Ice\Config.h" \
     "$(includedir)\Ice\DeprecatedStringConverter.h" \
     "$(includedir)\Ice\CommunicatorF.h" \
diff --git a/cpp/demo/Manual/lifecycle/.depend.mak b/cpp/demo/Manual/lifecycle/.depend.mak
index 8604cd43a93..be84dd78df8 100755
--- a/cpp/demo/Manual/lifecycle/.depend.mak
+++ b/cpp/demo/Manual/lifecycle/.depend.mak
@@ -198,8 +198,8 @@ Client.obj: \
     "Filesystem.h" \
     "Parser.h" \
 
-Grammar.obj: \
-	Grammar.cpp \
+Parser.obj: \
+	Parser.cpp \
     "Parser.h" \
     "$(includedir)\Ice\Ice.h" \
     "$(includedir)\IceUtil\PushDisableWarnings.h" \
@@ -316,11 +316,11 @@ Grammar.obj: \
     "$(includedir)\Ice\Service.h" \
     "Filesystem.h" \
 
-Parser.obj: \
-	Parser.cpp \
+Grammar.obj: \
+	Grammar.cpp \
+    "$(includedir)\IceUtil\PushDisableWarnings.h" \
     "Parser.h" \
     "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
     "$(includedir)\Ice\Config.h" \
     "$(includedir)\IceUtil\Config.h" \
     "$(includedir)\Ice\DeprecatedStringConverter.h" \
@@ -438,9 +438,9 @@ Scanner.obj: \
 	Scanner.cpp \
     "$(includedir)\IceUtil\ScannerConfig.h" \
     "$(includedir)\IceUtil\Config.h" \
+    "$(includedir)\IceUtil\PushDisableWarnings.h" \
     "Parser.h" \
     "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
     "$(includedir)\Ice\Config.h" \
     "$(includedir)\Ice\DeprecatedStringConverter.h" \
     "$(includedir)\Ice\CommunicatorF.h" \
diff --git a/cpp/demo/Manual/map_filesystem/.depend.mak b/cpp/demo/Manual/map_filesystem/.depend.mak
index 05f84a90191..286ae9153f1 100755
--- a/cpp/demo/Manual/map_filesystem/.depend.mak
+++ b/cpp/demo/Manual/map_filesystem/.depend.mak
@@ -203,8 +203,8 @@ Client.obj: \
     "Filesystem.h" \
     "Parser.h" \
 
-Grammar.obj: \
-	Grammar.cpp \
+Parser.obj: \
+	Parser.cpp \
     "Parser.h" \
     "$(includedir)\Ice\Ice.h" \
     "$(includedir)\IceUtil\PushDisableWarnings.h" \
@@ -321,11 +321,11 @@ Grammar.obj: \
     "$(includedir)\Ice\Service.h" \
     "Filesystem.h" \
 
-Parser.obj: \
-	Parser.cpp \
+Grammar.obj: \
+	Grammar.cpp \
+    "$(includedir)\IceUtil\PushDisableWarnings.h" \
     "Parser.h" \
     "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
     "$(includedir)\Ice\Config.h" \
     "$(includedir)\IceUtil\Config.h" \
     "$(includedir)\Ice\DeprecatedStringConverter.h" \
@@ -443,9 +443,9 @@ Scanner.obj: \
 	Scanner.cpp \
     "$(includedir)\IceUtil\ScannerConfig.h" \
     "$(includedir)\IceUtil\Config.h" \
+    "$(includedir)\IceUtil\PushDisableWarnings.h" \
     "Parser.h" \
     "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
     "$(includedir)\Ice\Config.h" \
     "$(includedir)\Ice\DeprecatedStringConverter.h" \
     "$(includedir)\Ice\CommunicatorF.h" \