diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-06-26 16:50:14 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-06-26 16:50:14 +0000 |
| commit | c992cb2fdc11f1cac4bc5cbce26e8e2bb3b57da0 (patch) | |
| tree | 697bdbf38a8a1f6b828a8bfbd08a478e19a82c6b /plugins/SmileyAdd | |
| parent | f616294363c642d138f9dc0ef6eceae639e2434c (diff) | |
- microkernel addded;
- version bumped to 0.92.2
git-svn-id: http://svn.miranda-ng.org/main/trunk@641 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/SmileyAdd')
| -rw-r--r-- | plugins/SmileyAdd/regexp/WCPattern.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/SmileyAdd/regexp/WCPattern.cpp b/plugins/SmileyAdd/regexp/WCPattern.cpp index d396bd187d..25f379f5e4 100644 --- a/plugins/SmileyAdd/regexp/WCPattern.cpp +++ b/plugins/SmileyAdd/regexp/WCPattern.cpp @@ -117,7 +117,7 @@ bkstring WCPattern::classUnion (bkstring s1, bkstring s2) const wchar_t * out = new wchar_t[66000];
std::sort(s1.begin(), s1.end());
std::sort(s2.begin(), s2.end());
- *std::set_union(s1.begin(), s1.end(), s2.begin(), s2.end(), out) = 0;
+ wchar_t* p = std::set_union(s1.begin(), s1.end(), s2.begin(), s2.end(), out); *p = 0;
bkstring ret = out;
delete [] out;
return ret;
|