diff options
| author |  Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2016-08-02 14:04:49 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-08-02 14:04:49 -0700 |
| commit | 6a4397eb33c1ba6b38b4d0b0883c9724bdb36557 (patch) | |
| tree | 143e000049217ac95741c78c8265b0613e49b226 | |
| parent | 329d6473db00d02e36788c134e62bba94d5a1ccd (diff) | |
| parent | ffd207fe4c942e5de5e178d9b9eccb38fb787635 (diff) | |
Merge pull request #7600 from dgquintas/fix_includes
fixed include guard script and faulty .h
| -rw-r--r-- | include/grpc++/impl/codegen/core_codegen.h | 5 | ||||
| -rwxr-xr-x | tools/distrib/check_include_guards.py | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/grpc++/impl/codegen/core_codegen.h b/include/grpc++/impl/codegen/core_codegen.h index 9699abfb43..2586b94504 100644 --- a/include/grpc++/impl/codegen/core_codegen.h +++ b/include/grpc++/impl/codegen/core_codegen.h @@ -31,6 +31,9 @@ * */ +#ifndef GRPCXX_IMPL_CODEGEN_CORE_CODEGEN_H +#define GRPCXX_IMPL_CODEGEN_CORE_CODEGEN_H + // This file should be compiled as part of grpc++. #include <grpc++/impl/codegen/core_codegen_interface.h> @@ -83,3 +86,5 @@ class CoreCodegen : public CoreCodegenInterface { }; } // namespace grpc + +#endif // GRPCXX_IMPL_CODEGEN_CORE_CODEGEN_H diff --git a/tools/distrib/check_include_guards.py b/tools/distrib/check_include_guards.py index 56b2924a1a..28312813f6 100755 --- a/tools/distrib/check_include_guards.py +++ b/tools/distrib/check_include_guards.py @@ -200,6 +200,6 @@ validator = GuardValidator() for filename in filename_list: if filename in KNOWN_BAD: continue - ok = validator.check(filename, args.fix) + ok = ok and validator.check(filename, args.fix) sys.exit(0 if ok else 1) |