diff options
author | Jisi Liu <jisi.liu@gmail.com> | 2017-08-03 11:13:25 -0700 |
---|---|---|
committer | Jisi Liu <jisi.liu@gmail.com> | 2017-08-03 11:13:25 -0700 |
commit | 4cbbf33b773fb95aa339ee50517fd375f5120ffe (patch) | |
tree | 7b747f7af11853481922d327fc15de93f6d9b154 /src/Makefile.am | |
parent | 778178479626b0e5b4de0701103a1bb0a067702d (diff) | |
download | protobuf-4cbbf33b773fb95aa339ee50517fd375f5120ffe.tar.gz protobuf-4cbbf33b773fb95aa339ee50517fd375f5120ffe.tar.bz2 protobuf-4cbbf33b773fb95aa339ee50517fd375f5120ffe.zip |
Fix invalid offsetof warning.
Use composition instead of inheritance for oneof default.
Diffstat (limited to 'src/Makefile.am')
-rw-r--r-- | src/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index ac41979d..a0c325dc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -930,7 +930,7 @@ no_warning_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \ ../gmock/gtest/lib/libgtest_main.la no_warning_test_CPPFLAGS = -I$(srcdir)/../gmock/gtest/include no_warning_test_CXXFLAGS = $(PTHREAD_CFLAGS) $(PTHREAD_DEF) $(ZLIB_DEF) \ - -Wall -Werror -Wno-invalid-offsetof -Werror=missing-declarations + -Wall -Werror -Werror=missing-declarations nodist_no_warning_test_SOURCES = no_warning_test.cc $(protoc_outputs) TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \ |