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
29 29     Property *props[hashRoots];
30 30     Property *enumnext;
31 31     int enumhash;
  32     static bool caseSensitiveFilenames;
32 33     static unsigned int HashString(const char *s, size_t len) {
33 34         unsigned int ret = 0;
34 35         while (len--) {
23 skipped lines
58 59     char *ToString(); // Caller must delete[] the return value
59 60     bool GetFirst(char **key, char **val);
60 61     bool GetNext(char **key, char **val);
  62     static void SetCaseSensitiveFilenames(bool caseSensitiveFilenames_) {
  63         caseSensitiveFilenames = caseSensitiveFilenames_;
  64     }
61 65  
62 66 private:
63     // copy-value semantics not implemented    67     // copy-value semantics not implemented
64 68     PropSet(const PropSet &copy);
65 69     void operator=(const PropSet &assign);
66 70 };
9 skipped lines
76 80     int len;
77 81     bool onlyLineEnds;  ///< Delimited by any white space or only line ends
78 82     bool sorted;
  83     bool sortedNoCase;
79 84     int starts[256];
80 85     WordList(bool onlyLineEnds_ = false) :
81         words(0), wordsNoCase(0), list(0), len(0), onlyLineEnds(onlyLineEnds_), sorted(false) {} 86         words(0), wordsNoCase(0), list(0), len(0), onlyLineEnds(onlyLineEnds_),
  87         sorted(false), sortedNoCase(false) {}
82 88     ~WordList() { Clear(); }
83 89     operator bool() { return len ? true : false; }
84 90     char *operator[](int ind) { return words[ind]; }
2 skipped lines
87 93     char *Allocate(int size);
88 94     void SetFromAllocated();
89 95     bool InList(const char *s);
  96     bool InListAbbreviated(const char *s, const char marker);
90 97     const char *GetNearestWord(const char *wordStart, int searchLen,
91 98         bool ignoreCase = false, SString wordCharacters="", int wordIndex = -1);
92 99     char *GetNearestWords(const char *wordStart, int searchLen,
16 skipped lines

   Text comparison Options  

Syntax colouring language used: C / C++
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  

Unchanged lineExample of unchanged line
Modified lineExample of modified line
Added lineExample of added line
Removed lineExample of removed line
Ignored lineExample of ignored line

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