- Move #include statement to header file to make it self-contained

- Change CString to String

diff --git a/Src/stringdiffs.cpp b/Src/stringdiffs.cpp
index 2642de4..c851c64 100644 (file)
--- a/Src/stringdiffs.cpp
+++ b/Src/stringdiffs.cpp
@@ -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"

diff --git a/Src/stringdiffs.h b/Src/stringdiffs.h
index 564a4e5..633f49c 100644 (file)
--- a/Src/stringdiffs.h
+++ b/Src/stringdiffs.h
@@ -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 @@ void sd_ComputeWordDiffs(const String & str1, const String & str2,
                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);