Merge branch 'python-fix' of https://github.com/tkruse/CppCoreGuidelines into tkruse-python-fix

This commit is contained in:
Andrew Pardoe
2016-09-12 11:53:55 -07:00
3 changed files with 71 additions and 12 deletions

View File

@@ -11,8 +11,13 @@ CXX_SRCS := $(wildcard *.cpp)
CXX_LINT := ${CXX_SRCS:.cpp=.lint}
.PHONY: cpplint-all
<<<<<<< HEAD
cpplint-all: $(CXX_LINT)
%.lint: %.cpp
@python ../../python/cpplint.py --verbose=0 --linelength=100 --filter=-legal/copyright,-build/include_order,-build/namespaces,-build/include,-build/include_subdir,-readability/inheritance,-readability/casting,-readability/namespace,-readability/alt_tokens,-readability/braces,-readability/fn_size,-whitespace/comments,-whitespace/braces,-whitespace/empty_loop_body,-whitespace/indent,-whitespace/newline,-runtime/explicit,-runtime/arrays,-runtime/int,-runtime/references,-runtime/string,-runtime/operator $< || (cat $< | nl -ba | grep -v 'md-split' && false)
=======
cpplint-all:
@python ../../python/cpplint_wrap.py *.cpp
>>>>>>> 084eb29d426688617b6e19846f508b6d1cb3a564