Merge pull request #2471 from jbrianceau/fix-include-style

Fix #include in cc files
pull/2493/head
Feng Xiao 8 years ago committed by GitHub
commit eb455ce1c9
  1. 2
      conformance/conformance_cpp.cc
  2. 2
      conformance/conformance_test.cc
  3. 2
      src/google/protobuf/compiler/js/well_known_types_embed.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>

@ -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>

@ -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"

Loading…
Cancel
Save