[Winmerge-svn] SF.net SVN: winmerge:[7426] branches/R2_14/Src

[<ge...@us...>]

Revision: 7426
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7426&view=rev
Author:   gerundt
Date:     2010-11-16 13:20:50 +0000 (Tue, 16 Nov 2010)

Log Message:
-----------
Remove MFC dependency from ByteComparator class.

Modified Paths:
--------------
    branches/R2_14/Src/CompareEngines/ByteComparator.cpp
    branches/R2_14/Src/Merge.vcproj
    branches/R2_14/Src/MergeX64.vcproj

Modified: branches/R2_14/Src/CompareEngines/ByteComparator.cpp
===================================================================
--- branches/R2_14/Src/CompareEngines/ByteComparator.cpp	2010-11-15 13:32:36 UTC (rev 7425)
+++ branches/R2_14/Src/CompareEngines/ByteComparator.cpp	2010-11-16 13:20:50 UTC (rev 7426)
@@ -6,7 +6,10 @@
 // ID line follows -- this is updated by SVN
 // $Id$
 
-#include "StdAfx.h"
+//#include "StdAfx.h"
+#include <windows.h>
+#include <tchar.h>
+#include <assert.h>
 #include "ByteComparator.h"
 #include "FileTextStats.h"
 #include "CompareOptions.h"
@@ -259,7 +262,7 @@
 						// "whitespace on both sides"
 						// should not come here, it should have been
 						// handled above
-						ASSERT(!iswsch(*ptr0));
+						assert(!iswsch(*ptr0));
 
 						if (iseolch(*ptr0))
 						{

Modified: branches/R2_14/Src/Merge.vcproj
===================================================================
--- branches/R2_14/Src/Merge.vcproj	2010-11-15 13:32:36 UTC (rev 7425)
+++ branches/R2_14/Src/Merge.vcproj	2010-11-16 13:20:50 UTC (rev 7426)
@@ -6678,6 +6678,9 @@
 						Optimization="1"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"
+						PrecompiledHeaderThrough=""
+						PrecompiledHeaderFile=""
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -6688,6 +6691,9 @@
 						Optimization="0"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"
+						PrecompiledHeaderThrough=""
+						PrecompiledHeaderFile=""
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>

Modified: branches/R2_14/Src/MergeX64.vcproj
===================================================================
--- branches/R2_14/Src/MergeX64.vcproj	2010-11-15 13:32:36 UTC (rev 7425)
+++ branches/R2_14/Src/MergeX64.vcproj	2010-11-16 13:20:50 UTC (rev 7426)
@@ -11243,6 +11243,7 @@
 						Optimization="1"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -11253,6 +11254,7 @@
 						Optimization="1"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -11263,6 +11265,7 @@
 						Optimization="0"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
@@ -11274,6 +11277,7 @@
 						Optimization="0"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.