Style fixes

This commit is contained in:
Maxime Coste 2014-10-28 20:01:55 +00:00
parent d3091cb553
commit 2944dbc332
4 changed files with 4 additions and 4 deletions

View File

@ -48,7 +48,7 @@ Completions HighlighterGroup::complete_child(StringView path, ByteCount cursor_p
auto condition = [=](const HighlighterMap::value_type& hl) auto condition = [=](const HighlighterMap::value_type& hl)
{ {
return not group || hl.second->has_children(); return not group or hl.second->has_children();
}; };
return { 0, 0, m_highlighters.complete_id_if(path, cursor_pos, condition) }; return { 0, 0, m_highlighters.complete_id_if(path, cursor_pos, condition) };
} }

View File

@ -24,7 +24,7 @@ struct InsertCompleterDesc
{} {}
bool operator==(const InsertCompleterDesc& other) const bool operator==(const InsertCompleterDesc& other) const
{ return mode == other.mode && param == other.param; } { return mode == other.mode and param == other.param; }
bool operator!=(const InsertCompleterDesc& other) const bool operator!=(const InsertCompleterDesc& other) const
{ return !(*this == other); } { return !(*this == other); }

View File

@ -48,7 +48,7 @@ public:
InternedString& operator=(const InternedString& str) InternedString& operator=(const InternedString& str)
{ {
if (str.data() == data() && str.length() == length()) if (str.data() == data() and str.length() == length())
return *this; return *this;
static_cast<StringView&>(*this) = str; static_cast<StringView&>(*this) = str;
if (str.m_slot != m_slot) if (str.m_slot != m_slot)

View File

@ -43,7 +43,7 @@ void run_unit_tests();
String runtime_directory() String runtime_directory()
{ {
char buffer[2048]; char buffer[2048];
#if defined(__linux__) || defined(__CYGWIN__) #if defined(__linux__) or defined(__CYGWIN__)
ssize_t res = readlink("/proc/self/exe", buffer, 2048); ssize_t res = readlink("/proc/self/exe", buffer, 2048);
kak_assert(res != -1); kak_assert(res != -1);
buffer[res] = '\0'; buffer[res] = '\0';