diff options
| author | Loïc Blot <loic.blot@unix-experience.fr> | 2018-03-23 11:07:19 +0100 |
|---|---|---|
| committer | Loïc Blot <nerzhul@users.noreply.github.com> | 2019-03-14 12:30:13 +0100 |
| commit | a6a04c4b5b0cd475ea265b63ff6ff52daf66db42 (patch) | |
| tree | f18daa7584cba90648b698adae943dfdd43571f7 /src/irrlicht_changes | |
| parent | aafbdd442f6bb6d6730fc7fdff76cbd0e3be301b (diff) | |
| download | minetest-a6a04c4b5b0cd475ea265b63ff6ff52daf66db42.tar.gz minetest-a6a04c4b5b0cd475ea265b63ff6ff52daf66db42.tar.bz2 minetest-a6a04c4b5b0cd475ea265b63ff6ff52daf66db42.zip | |
Update our tooling (Clang 5 -> 7, GCC 7 -> 8)
This change permits to use up-to-date compilers, clang-tidy and
clang-format
It also refactor the tidy/format step to drop the binary selection from
scripts and perform it directly in travis
Diffstat (limited to 'src/irrlicht_changes')
| -rw-r--r-- | src/irrlicht_changes/irrUString.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/irrlicht_changes/irrUString.h b/src/irrlicht_changes/irrUString.h index b628c092c..fce49e717 100644 --- a/src/irrlicht_changes/irrUString.h +++ b/src/irrlicht_changes/irrUString.h @@ -2916,13 +2916,13 @@ public: ret[0] = unicode::BOM; else if (endian == unicode::EUTFEE_LITTLE) { - uchar8_t* ptr8 = reinterpret_cast<uchar8_t*>(&ret[0]); + uchar8_t* ptr8 = reinterpret_cast<uchar8_t*>(ret.c_str()); *ptr8++ = unicode::BOM_ENCODE_UTF16_LE[0]; *ptr8 = unicode::BOM_ENCODE_UTF16_LE[1]; } else { - uchar8_t* ptr8 = reinterpret_cast<uchar8_t*>(&ret[0]); + uchar8_t* ptr8 = reinterpret_cast<uchar8_t*>(ret.c_str()); *ptr8++ = unicode::BOM_ENCODE_UTF16_BE[0]; *ptr8 = unicode::BOM_ENCODE_UTF16_BE[1]; } |