diff options
| author | Yilun Chong <chongyilun250@sina.com> | 2017-06-30 17:38:50 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-30 17:38:50 -0700 |
| commit | e82ba0b8026eb16c40ceba861f02c643c36e8232 (patch) | |
| tree | 2aa89a917c6091923682221026507aa9eea1aba4 /src/Makefile.am | |
| parent | 726ba33d98cd06c268f88b7dedf2a9a7916d978d (diff) | |
| parent | ecca6ea95d56a6f70ff7b223ec3f904758acc8b1 (diff) | |
| download | protobuf-e82ba0b8026eb16c40ceba861f02c643c36e8232.tar.gz protobuf-e82ba0b8026eb16c40ceba861f02c643c36e8232.tar.bz2 protobuf-e82ba0b8026eb16c40ceba861f02c643c36e8232.zip | |
Merge branch 'master' into ConformanceTestYilunChong
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 bfb875ac..45a8a79b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -924,7 +924,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 + -Wall -Wconversion -Werror nodist_no_warning_test_SOURCES = no_warning_test.cc $(protoc_outputs) TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \ |