summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authortycho <tycho@localhost>2015-03-11 11:39:49 +0100
committertycho <tycho@localhost>2015-03-11 11:39:49 +0100
commit8646e95b6f91942e7741830dc057daa0e9a40aed (patch)
tree8802209f399b855bf2d13b08bfef0dea8cca0b74 /src
parentFixed Sequence Generator for IntGen (diff)
downloadcuberite-8646e95b6f91942e7741830dc057daa0e9a40aed.tar
cuberite-8646e95b6f91942e7741830dc057daa0e9a40aed.tar.gz
cuberite-8646e95b6f91942e7741830dc057daa0e9a40aed.tar.bz2
cuberite-8646e95b6f91942e7741830dc057daa0e9a40aed.tar.lz
cuberite-8646e95b6f91942e7741830dc057daa0e9a40aed.tar.xz
cuberite-8646e95b6f91942e7741830dc057daa0e9a40aed.tar.zst
cuberite-8646e95b6f91942e7741830dc057daa0e9a40aed.zip
Diffstat (limited to '')
-rw-r--r--src/CheckBasicStyle.lua6
-rw-r--r--src/Generating/IntGen.h13
2 files changed, 12 insertions, 7 deletions
diff --git a/src/CheckBasicStyle.lua b/src/CheckBasicStyle.lua
index 648a5711b..16e34e321 100644
--- a/src/CheckBasicStyle.lua
+++ b/src/CheckBasicStyle.lua
@@ -101,9 +101,9 @@ local g_ViolationPatterns =
{"&&[^(]+!=", "Add parenthesis around comparison"},
{"!=[^)]+||", "Add parenthesis around comparison"},
{"||[^(]+!=", "Add parenthesis around comparison"},
- {"<[^)T][^)]*&&", "Add parenthesis around comparison"}, -- Must take special care of templates: "template <T> fn(Args && ...)"
- {"&&[^(]+<", "Add parenthesis around comparison"},
- {"<[^)T][^)]*||", "Add parenthesis around comparison"}, -- Must take special care of templates: "template <T> fn(Args && ...)"
+ {"<[^)>]*&&", "Add parenthesis around comparison"}, -- Must take special care of templates: "template <T> fn(Args && ...)"
+ -- Cannot check a < following a && due to functions of the form x fn(y&& a, z<b> c)
+ {"<[^)>]*||", "Add parenthesis around comparison"}, -- Must take special care of templates: "template <T> fn(Args && ...)"
{"||[^(]+<", "Add parenthesis around comparison"},
-- Cannot check ">" because of "obj->m_Flag &&". Check at least ">=":
{">=[^)]+&&", "Add parenthesis around comparison"},
diff --git a/src/Generating/IntGen.h b/src/Generating/IntGen.h
index 1ffc15c6b..fac500fa8 100644
--- a/src/Generating/IntGen.h
+++ b/src/Generating/IntGen.h
@@ -73,14 +73,19 @@ public:
// Code adapted from http://stackoverflow.com/questions/7858817/unpacking-a-tuple-to-call-a-matching-function-pointer
template<int ...>
-struct seq { };
+struct seq
+{
+};
template<int N, int ...S>
-struct gens : gens<N-1, N-1, S...> { };
+struct gens : gens<N-1, N-1, S...>
+{
+};
template<int ...S>
-struct gens<0, S...> {
- typedef seq<S...> type;
+struct gens<0, S...>
+{
+ typedef seq<S...> type;
};