Преглед изворни кода

Merge pull request #6270 from haon4/update_generated_codes

Update generated codes
Hao Nguyen пре 6 година
родитељ
комит
b97b623d7b
3 измењених фајлова са 3 додато и 2 уклоњено
  1. BIN
      csharp/src/Google.Protobuf.Test/testprotos.pb
  2. 2 2
      src/google/protobuf/type.pb.h
  3. 1 0
      update_version.py

BIN
csharp/src/Google.Protobuf.Test/testprotos.pb


+ 2 - 2
src/google/protobuf/type.pb.h

@@ -8,12 +8,12 @@
 #include <string>
 #include <string>
 
 
 #include <google/protobuf/port_def.inc>
 #include <google/protobuf/port_def.inc>
-#if PROTOBUF_VERSION < 3008000
+#if PROTOBUF_VERSION < 3009000
 #error This file was generated by a newer version of protoc which is
 #error This file was generated by a newer version of protoc which is
 #error incompatible with your Protocol Buffer headers. Please update
 #error incompatible with your Protocol Buffer headers. Please update
 #error your headers.
 #error your headers.
 #endif
 #endif
-#if 3008000 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3009000 < PROTOBUF_MIN_PROTOC_VERSION
 #error This file was generated by an older version of protoc which is
 #error This file was generated by an older version of protoc which is
 #error incompatible with your Protocol Buffer headers. Please
 #error incompatible with your Protocol Buffer headers. Please
 #error regenerate this file with a newer version of protoc.
 #error regenerate this file with a newer version of protoc.

+ 1 - 0
update_version.py

@@ -169,6 +169,7 @@ def UpdateCpp():
   RewriteTextFile('src/google/protobuf/source_context.pb.h', RewritePbH)
   RewriteTextFile('src/google/protobuf/source_context.pb.h', RewritePbH)
   RewriteTextFile('src/google/protobuf/struct.pb.h', RewritePbH)
   RewriteTextFile('src/google/protobuf/struct.pb.h', RewritePbH)
   RewriteTextFile('src/google/protobuf/timestamp.pb.h', RewritePbH)
   RewriteTextFile('src/google/protobuf/timestamp.pb.h', RewritePbH)
+  RewriteTextFile('src/google/protobuf/type.pb.h', RewritePbH)
   RewriteTextFile('src/google/protobuf/wrappers.pb.h', RewritePbH)
   RewriteTextFile('src/google/protobuf/wrappers.pb.h', RewritePbH)
   RewriteTextFile('src/google/protobuf/compiler/plugin.pb.h', RewritePbH)
   RewriteTextFile('src/google/protobuf/compiler/plugin.pb.h', RewritePbH)