diff options
author | Thomas Van Lenten <thomasvl@google.com> | 2015-05-18 15:01:15 -0400 |
---|---|---|
committer | Thomas Van Lenten <thomasvl@google.com> | 2015-05-19 20:25:19 -0400 |
commit | ce55ff9441753164a34f31a48572ea2f1fb38aba (patch) | |
tree | 454090707d9d8a5e0289c9e10dbcbc4933bdb30c /src/google/protobuf/compiler/objectivec/objectivec_file.cc | |
parent | 4324bf6bf2d217a478356ccc190acb21347b63b3 (diff) |
Getting the ObjC generator building on Windows.
Remove the ClassList support (maybe bring it back in the future).
Trim the includes to hopefully get a working Window build.
Add some more returns after switches for compilers that warn even when all values of the enum are handled.
Use ghtonl instead of htonl.
Change the use of [u]int(8,32)_t within the ObjC generator code to [u]int(8,32) to match the rest of the compiler.
Add objective-c generator files to Visual Studio project.
Diffstat (limited to 'src/google/protobuf/compiler/objectivec/objectivec_file.cc')
-rw-r--r-- | src/google/protobuf/compiler/objectivec/objectivec_file.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/google/protobuf/compiler/objectivec/objectivec_file.cc b/src/google/protobuf/compiler/objectivec/objectivec_file.cc index f1e8c0a0..b3ad448e 100644 --- a/src/google/protobuf/compiler/objectivec/objectivec_file.cc +++ b/src/google/protobuf/compiler/objectivec/objectivec_file.cc @@ -40,13 +40,14 @@ #include <google/protobuf/stubs/strutil.h> #include <sstream> +namespace google { +namespace protobuf { + // This is also found in GPBBootstrap.h, and needs to be kept in sync. It // is the version check done to ensure generated code works with the current // runtime being used. -const int32_t GOOGLE_PROTOBUF_OBJC_GEN_VERSION = 30000; +const int32 GOOGLE_PROTOBUF_OBJC_GEN_VERSION = 30000; -namespace google { -namespace protobuf { namespace compiler { namespace objectivec { FileGenerator::FileGenerator(const FileDescriptor *file) |