diff --git a/.clang-format b/.clang-format new file mode 100644 index 00000000..5b9bfe6d --- /dev/null +++ b/.clang-format @@ -0,0 +1,4 @@ +# Run manually to reformat a file: +# clang-format -i --style=file +Language: Cpp +BasedOnStyle: Google diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 846dd8ab..b52f8ee5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -78,7 +78,8 @@ itself is a valuable contribution. To keep the source consistent, readable, diffable and easy to merge, we use a fairly rigid coding style, as defined by the [google-styleguide](https://github.com/google/styleguide) project. All patches will be expected -to conform to the style outlined [here](https://google.github.io/styleguide/cppguide.html). +to conform to the style outlined [here](https://google.github.io/styleguide/cppguide.html). +Use [.clang-format](https://github.com/google/googletest/blob/master/.clang-format) to check your formatting ## Requirements for Contributors ### diff --git a/README.md b/README.md index 9804960e..adadf553 100644 --- a/README.md +++ b/README.md @@ -107,7 +107,7 @@ package (as described below): * GNU-compatible Make or gmake * POSIX-standard shell * POSIX(-2) Regular Expressions (regex.h) - * A C++98-standard-compliant compiler + * A C++11-standard-compliant compiler ### Windows Requirements ###