Compared files  

Left
C:\SDK\wxWidgets-2.6.2\contrib\src\stc\scintilla\include\PropSet.h
Last modified2005-03-21 12:17:52.000 +0100
Size2.9 Kb (108 Lines)
EncodingLatin 1 - ANSI (CP1252) default
Right
C:\SDK\wxWidgets-2.6.3\contrib\src\stc\scintilla\include\PropSet.h
Last modified2006-03-16 13:07:02.000 +0100
Size3.1 Kb (115 Lines)
EncodingLatin 1 - ANSI (CP1252) default


   Comparison Statistics  

Detailed Statistics

All Changes
 BlocksLines
Unchanged7106
Inserted46
Deleted00
Ignored00
Changed25



   Comparison Details  

28 skipped lines
29U29U    Property *props[hashRoots];
30U30U    Property *enumnext;
31U31U    int enumhash;
  32A    static bool caseSensitiveFilenames;
32U33U    static unsigned int HashString(const char *s, size_t len) {
33U34U        unsigned int ret = 0;
34U35U        while (len--) {
23 skipped lines
58U59U    char *ToString(); // Caller must delete[] the return value
59U60U    bool GetFirst(char **key, char **val);
60U61U    bool GetNext(char **key, char **val);
  62A    static void SetCaseSensitiveFilenames(bool caseSensitiveFilenames_) {
  63A        caseSensitiveFilenames = caseSensitiveFilenames_;
  64A    }
61U65U 
62U66Uprivate:
63C    // copy-value semantics not implemented    67C    // copy-value semantics not implemented
64U68U    PropSet(const PropSet &copy);
65U69U    void operator=(const PropSet &assign);
66U70U};
9 skipped lines
76U80U    int len;
77U81U    bool onlyLineEnds;  ///< Delimited by any white space or only line ends
78U82U    bool sorted;
  83A    bool sortedNoCase;
79U84U    int starts[256];
80U85U    WordList(bool onlyLineEnds_ = false) :
81C        words(0), wordsNoCase(0), list(0), len(0), onlyLineEnds(onlyLineEnds_), sorted(false) {} 86C        words(0), wordsNoCase(0), list(0), len(0), onlyLineEnds(onlyLineEnds_),
  87C        sorted(false), sortedNoCase(false) {}
82U88U    ~WordList() { Clear(); }
83U89U    operator bool() { return len ? true : false; }
84U90U    char *operator[](int ind) { return words[ind]; }
2 skipped lines
87U93U    char *Allocate(int size);
88U94U    void SetFromAllocated();
89U95U    bool InList(const char *s);
  96A    bool InListAbbreviated(const char *s, const char marker);
90U97U    const char *GetNearestWord(const char *wordStart, int searchLen,
91U98U        bool ignoreCase = false, SString wordCharacters="", int wordIndex = -1);
92U99U    char *GetNearestWords(const char *wordStart, int searchLen,
16 skipped lines

   Text comparison Options  

Match character case: yes.
Match line endings: no.
Match spaces

At start of lines: yes,
In middle of lines: yes,
At end of lines: yes.
Blank lines as empty lines: no.
Activate comparison algorithm
At word level: yes,
At character level: no.


   Legend  

UExample of unchanged line
CExample of modified line
AExample of added line
RExample of removed line
IExample of ignored line
Modified text
Added text
Removed text

This report has been generated by Ellié Computing Merge on 2006-09-07 16:23:28.001 +0200.
© 2005-2006 Ellié Computing http://www.elliecomputing.com. All rights reserved.