From 4cbbf33b773fb95aa339ee50517fd375f5120ffe Mon Sep 17 00:00:00 2001 From: Jisi Liu Date: Thu, 3 Aug 2017 11:13:25 -0700 Subject: Fix invalid offsetof warning. Use composition instead of inheritance for oneof default. --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Makefile.am') 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 \ -- cgit v1.2.3