diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2016-12-12 16:27:16 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-12-12 16:27:16 -0800 |
| commit | eb455ce1c92e9fc217ece0cfc58f9a698fd0f635 (patch) | |
| tree | 9fe022d344a8297bbe199f74689d2f6b5dfffd68 | |
| parent | 6b86a8922b3a13a7a446cb8d75bdf2d536379344 (diff) | |
| parent | e3da722b665fad1cfe374f9396fa23764eac8313 (diff) | |
Merge pull request #2471 from jbrianceau/fix-include-style
Fix #include in cc files
| -rw-r--r-- | conformance/conformance_cpp.cc | 2 | ||||
| -rw-r--r-- | conformance/conformance_test.cc | 2 | ||||
| -rwxr-xr-x | src/google/protobuf/compiler/js/well_known_types_embed.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/conformance/conformance_cpp.cc b/conformance/conformance_cpp.cc index df3f2acd..b865cd93 100644 --- a/conformance/conformance_cpp.cc +++ b/conformance/conformance_cpp.cc @@ -33,7 +33,7 @@ #include <unistd.h> #include "conformance.pb.h" -#include "google/protobuf/test_messages_proto3.pb.h" +#include <google/protobuf/test_messages_proto3.pb.h> #include <google/protobuf/util/json_util.h> #include <google/protobuf/util/type_resolver_util.h> diff --git a/conformance/conformance_test.cc b/conformance/conformance_test.cc index d162f4ea..fd8aab8b 100644 --- a/conformance/conformance_test.cc +++ b/conformance/conformance_test.cc @@ -34,7 +34,7 @@ #include "conformance.pb.h" #include "conformance_test.h" -#include "google/protobuf/test_messages_proto3.pb.h" +#include <google/protobuf/test_messages_proto3.pb.h> #include <google/protobuf/stubs/common.h> #include <google/protobuf/stubs/stringprintf.h> diff --git a/src/google/protobuf/compiler/js/well_known_types_embed.cc b/src/google/protobuf/compiler/js/well_known_types_embed.cc index b589ccb5..71fd557f 100755 --- a/src/google/protobuf/compiler/js/well_known_types_embed.cc +++ b/src/google/protobuf/compiler/js/well_known_types_embed.cc @@ -1,4 +1,4 @@ -#include "google/protobuf/compiler/js/well_known_types_embed.h" +#include <google/protobuf/compiler/js/well_known_types_embed.h> struct FileToc well_known_types_js[] = { {"any.js", "// Protocol Buffers - Google's data interchange format\n" |