|
From: <mar...@us...> - 2009-01-31 04:20:57
|
Revision: 6399
http://winmerge.svn.sourceforge.net/winmerge/?rev=6399&view=rev
Author: marcelgosselin
Date: 2009-01-31 04:20:50 +0000 (Sat, 31 Jan 2009)
Log Message:
-----------
- Move #include statement to header file to make it self-contained
- Change CString to String
Modified Paths:
--------------
trunk/Src/stringdiffs.cpp
trunk/Src/stringdiffs.h
Modified: trunk/Src/stringdiffs.cpp
===================================================================
--- trunk/Src/stringdiffs.cpp 2009-01-31 04:06:39 UTC (rev 6398)
+++ trunk/Src/stringdiffs.cpp 2009-01-31 04:20:50 UTC (rev 6399)
@@ -8,9 +8,8 @@
// $Id$
#include "StdAfx.h"
-#include <vector>
#include <mbctype.h>
-#include "UnicodeString.h"
+
#include "stringdiffs.h"
#include "CompareOptions.h"
#include "stringdiffsi.h"
Modified: trunk/Src/stringdiffs.h
===================================================================
--- trunk/Src/stringdiffs.h 2009-01-31 04:06:39 UTC (rev 6398)
+++ trunk/Src/stringdiffs.h 2009-01-31 04:20:50 UTC (rev 6399)
@@ -10,6 +10,7 @@
#ifndef stringdiffs_h_included
#define stringdiffs_h_included
+#include "UnicodeString.h"
#include <vector>
/** @brief One difference between two strings */
@@ -39,7 +40,7 @@
bool case_sensitive, int whitespace, int breakType, bool byte_level,
std::vector<wdiff*> * pDiffs);
-void sd_ComputeByteDiff(String & str1, CString & str2,
+void sd_ComputeByteDiff(String & str1, String & str2,
bool casitive, int xwhite,
int &begin1, int &begin2, int &end1, int &end2);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
