diff options
| author | Jisi Liu <jisi.liu@gmail.com> | 2016-04-28 14:43:08 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2016-04-28 14:43:08 -0700 |
| commit | 12fdeb9b41cb5ce2a13a6f10f0626d6e67e9f237 (patch) | |
| tree | 82b9820ae26decd6ac41bd8a06185d978980ee3c /src/google/protobuf/api.pb.cc | |
| parent | cf14183bcd5485b4a71541599ddce0b35eb71352 (diff) | |
| parent | b53417c7356deab70f44b60bd7e6270023ddc3b6 (diff) | |
| download | protobuf-12fdeb9b41cb5ce2a13a6f10f0626d6e67e9f237.tar.gz protobuf-12fdeb9b41cb5ce2a13a6f10f0626d6e67e9f237.tar.bz2 protobuf-12fdeb9b41cb5ce2a13a6f10f0626d6e67e9f237.zip | |
Merge branch 'master' of github.com:google/protobuf
Diffstat (limited to 'src/google/protobuf/api.pb.cc')
| -rw-r--r-- | src/google/protobuf/api.pb.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/google/protobuf/api.pb.cc b/src/google/protobuf/api.pb.cc index def2ec19..cbeba302 100644 --- a/src/google/protobuf/api.pb.cc +++ b/src/google/protobuf/api.pb.cc @@ -996,8 +996,16 @@ Method* Method::New(::google::protobuf::Arena* arena) const { void Method::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.Method) +#if defined(__clang__) +#define ZR_HELPER_(f) \ + _Pragma("clang diagnostic push") \ + _Pragma("clang diagnostic ignored \"-Winvalid-offsetof\"") \ + __builtin_offsetof(Method, f) \ + _Pragma("clang diagnostic pop") +#else #define ZR_HELPER_(f) reinterpret_cast<char*>(\ &reinterpret_cast<Method*>(16)->f) +#endif #define ZR_(first, last) do {\ ::memset(&first, 0,\ |