xenia/home
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'lenormf/fix-4340'

Browse Source
This commit is contained in:
Maxime Coste 2021-10-24 09:04:14 +11:00
commit 5c1e10decb
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/keymap_manager.hh
View File

@ -51,7 +51,7 @@ public:
return m_parent->user_modes(); return m_parent->user_modes();
return m_user_modes; return m_user_modes;
} }
void add_user_mode(const String user_mode_name); void add_user_mode(String user_mode_name);
private: private:
KeymapManager() KeymapManager()

2
src/shared_string.hh
View File

@ -24,7 +24,7 @@ struct StringData : UseMemoryDomain<MemoryDomain::SharedString>
private: private:
StringData(int len) : refcount(0), length(len) {} StringData(int len) : refcount(0), length(len) {}
static constexpr uint32_t interned_flag = 1 << 31; static constexpr uint32_t interned_flag = 1u << 31;
static constexpr uint32_t refcount_mask = ~interned_flag; static constexpr uint32_t refcount_mask = ~interned_flag;
struct PtrPolicy struct PtrPolicy

2
src/string_utils.cc
View File

@ -21,7 +21,7 @@ String trim_indent(StringView str)
utf8::iterator it{str.begin(), str}; utf8::iterator it{str.begin(), str};
while (it != str.end() and is_horizontal_blank(*it)) while (it != str.end() and is_horizontal_blank(*it))
it++; ++it;
const StringView indent{str.begin(), it.base()}; const StringView indent{str.begin(), it.base()};
return accumulate(str | split_after<StringView>('\n') | transform([&](auto&& line) { return accumulate(str | split_after<StringView>('\n') | transform([&](auto&& line) {