diff options
| author | Nay <dnpd.dd@gmail.com> | 2013-07-20 14:23:51 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2013-07-20 14:55:25 +0100 |
| commit | 7ce340bbd6473522df38fd3e8602d375e6d633dc (patch) | |
| tree | d83f25b18c1c49adb92a827911b9948b8d049838 | |
| parent | d04bb0dd618881628b2ccdec45eb19d9736a3d54 (diff) | |
Core/Dependencies: Update utf8-cpp to version 2.3.4
| -rw-r--r-- | dep/PackageList.txt | 2 | ||||
| -rw-r--r-- | dep/utf8cpp/utf8/checked.h | 6 | ||||
| -rw-r--r-- | dep/utf8cpp/utf8/unchecked.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/dep/PackageList.txt b/dep/PackageList.txt index 4f52dfca906..f932591ae32 100644 --- a/dep/PackageList.txt +++ b/dep/PackageList.txt @@ -30,7 +30,7 @@ SFMT (SIMD-oriented Fast Mersenne Twister) utf8-cpp (UTF-8 with C++ in a Portable Way) http://utfcpp.sourceforge.net/ - Version: 2.3.2 + Version: 2.3.4 zlib (A Massively Spiffy Yet Delicately Unobtrusive Compression Library) http://www.zlib.net/ diff --git a/dep/utf8cpp/utf8/checked.h b/dep/utf8cpp/utf8/checked.h index 3b00644444c..13311551381 100644 --- a/dep/utf8cpp/utf8/checked.h +++ b/dep/utf8cpp/utf8/checked.h @@ -109,13 +109,13 @@ namespace utf8 case internal::NOT_ENOUGH_ROOM: throw not_enough_room(); case internal::INVALID_LEAD: - utf8::append (replacement, out); + out = utf8::append (replacement, out); ++start; break; case internal::INCOMPLETE_SEQUENCE: case internal::OVERLONG_SEQUENCE: case internal::INVALID_CODE_POINT: - utf8::append (replacement, out); + out = utf8::append (replacement, out); ++start; // just one replacement mark for the sequence while (start != end && utf8::internal::is_trail(*start)) @@ -270,7 +270,7 @@ namespace utf8 octet_iterator range_start; octet_iterator range_end; public: - iterator () {}; + iterator () {} explicit iterator (const octet_iterator& octet_it, const octet_iterator& range_start, const octet_iterator& range_end) : diff --git a/dep/utf8cpp/utf8/unchecked.h b/dep/utf8cpp/utf8/unchecked.h index b4547fad945..cb2427166b1 100644 --- a/dep/utf8cpp/utf8/unchecked.h +++ b/dep/utf8cpp/utf8/unchecked.h @@ -179,7 +179,7 @@ namespace utf8 class iterator : public std::iterator <std::bidirectional_iterator_tag, uint32_t> { octet_iterator it; public: - iterator () {}; + iterator () {} explicit iterator (const octet_iterator& octet_it): it(octet_it) {} // the default "big three" are OK octet_iterator base () const { return it; } |