Website Summary Files Commits Branches @commit @diff @stats
path: root / JSImpl
diff options
context:
space:
mode:
3 files changed, 3 insertions, 3 deletions
-rw-r--r--JSImpl/src/Expression.h2
-rw-r--r--JSImpl/src/JSONParser.cpp2
-rw-r--r--JSImpl/test/googletest/googletest/src/gtest-internal-inl.h2
diff --git a/JSImpl/src/Expression.h b/JSImpl/src/Expression.h
index 333568f..37b927f 100644
--- a/JSImpl/src/Expression.h
+++ b/JSImpl/src/Expression.h
@@ -45,7 +45,7 @@ class Expression : public IPLEnableShared<Expression>
MEMBERS_ITERATOR(GENERATE_GETTERS) \
private: \
MEMBERS_ITERATOR(GENERATE_MEMBER_DEFINITIONS) \
- bool m_dummy; \
+ bool m_dummy; /* NOLINT */ \
};
EXPRESSION_DEFINITION_ITERATOR(GENERATE_EXPRESSION);
diff --git a/JSImpl/src/JSONParser.cpp b/JSImpl/src/JSONParser.cpp
index 275fb0e..3f87aad 100644
--- a/JSImpl/src/JSONParser.cpp
+++ b/JSImpl/src/JSONParser.cpp
@@ -55,7 +55,7 @@ EXPRESSION_DEFINITION_ITERATOR(GENERATE_EXPRESSION_TYPE_ENUMS);
#undef GENERATE_EXPRESSION_TYPE_ENUM_MEMBERS
template <typename T>
-ExpressionPtr JSONParseWrap(const char*& json, const char* eName)
+ExpressionPtr JSONParseWrap(const char*&, const char*)
{
assert(false);
return nullptr;
diff --git a/JSImpl/test/googletest/googletest/src/gtest-internal-inl.h b/JSImpl/test/googletest/googletest/src/gtest-internal-inl.h
index 4790041..b6916d6 100644
--- a/JSImpl/test/googletest/googletest/src/gtest-internal-inl.h
+++ b/JSImpl/test/googletest/googletest/src/gtest-internal-inl.h
@@ -152,7 +152,7 @@ inline int GetNextRandomSeed(int seed) {
// This class saves the values of all Google Test flags in its c'tor, and
// restores them in its d'tor.
-class GTestFlagSaver {
+class GTestFlagSaver { // NOLINT - lots of padding
public:
// The c'tor.
GTestFlagSaver() {