summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxime Coste <mawww@kakoune.org>2018-04-03 09:45:08 +1000
committerMaxime Coste <mawww@kakoune.org>2018-04-03 09:45:08 +1000
commit895ec93b5cbde6a450fca03e6443f4cdd17ca28d (patch)
tree9258b0961a5aa59d17d19186a5917804fd24a313
parentff073bcce13f4f207a55b079e78cd38ec58a64f2 (diff)
coding-style.asciidoc: Update to C++14 and add a few more guidelines
-rw-r--r--doc/coding-style.asciidoc6
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/coding-style.asciidoc b/doc/coding-style.asciidoc
index 602fb23e..250159df 100644
--- a/doc/coding-style.asciidoc
+++ b/doc/coding-style.asciidoc
@@ -1,7 +1,7 @@
C++ Coding Style
================
-Kakoune is written in C++11, here are the main coding style points:
+Kakoune is written in C++14, here are the main coding style points:
* Avoid external dependencies besides posix/stdc++/ncurses
@@ -14,6 +14,8 @@ Kakoune is written in C++11, here are the main coding style points:
* opening brackets on their own lines by default, except when declaring
an object where the opening bracket follows the equal sign.
+ * use alternative logical operator names (and, or, not instead of &&, ||, !)
+
-----
int func()
{
@@ -33,7 +35,7 @@ int array[] = {
* End lines with an operator when continuing on the next line
----
-if (condition1 ||
+if (condition1 or
condition2)
----