diff options
author | sbc@chromium.org <sbc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-21 02:12:11 +0000 |
---|---|---|
committer | sbc@chromium.org <sbc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-21 02:12:11 +0000 |
commit | 2d387351976d7aa3161e1eae991780d3c34e40af (patch) | |
tree | cd6821b7b4c735a75c760c40267875e1590badf7 /native_client_sdk | |
parent | 155ca14aad61ea77e081a1d529febdb7def06f69 (diff) | |
download | chromium_src-2d387351976d7aa3161e1eae991780d3c34e40af.zip chromium_src-2d387351976d7aa3161e1eae991780d3c34e40af.tar.gz chromium_src-2d387351976d7aa3161e1eae991780d3c34e40af.tar.bz2 |
[NaCl SDK] Remove unneeded warning supressions.
The no-unused-local-typedefs flag is no longer needed
since we moved to a new version of gtest.
The other warnings are all fixed in this CL.
R=binji@chromium.org, binji
BUG=270739
Review URL: https://codereview.chromium.org/77043002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236370 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
8 files changed, 6 insertions, 25 deletions
diff --git a/native_client_sdk/src/examples/tutorial/testing/example.dsc b/native_client_sdk/src/examples/tutorial/testing/example.dsc index 40d25a5..8af9caa 100644 --- a/native_client_sdk/src/examples/tutorial/testing/example.dsc +++ b/native_client_sdk/src/examples/tutorial/testing/example.dsc @@ -7,8 +7,7 @@ 'TYPE' : 'main', 'SOURCES' : ['testing.cc'], 'LIBS' : ['ppapi_simple', 'nacl_io', 'ppapi_cpp', 'ppapi', 'gtest', 'pthread'], - 'CXXFLAGS': ['-Wno-sign-compare', '-Wno-unused-private-field'], - 'CFLAGS_GCC': ['-Wno-unused-local-typedefs'], + 'CXXFLAGS': ['-Wno-sign-compare'] } ], 'DATA': [ diff --git a/native_client_sdk/src/libraries/gmock/library.dsc b/native_client_sdk/src/libraries/gmock/library.dsc index a61ffeb..1f4c942 100644 --- a/native_client_sdk/src/libraries/gmock/library.dsc +++ b/native_client_sdk/src/libraries/gmock/library.dsc @@ -18,7 +18,6 @@ ], # gmock-spec-builders.cc:248: error: enumeration value ‘FAIL’ not handled in switch 'CXXFLAGS': ['-Wno-switch-enum'], - 'CFLAGS_GCC': ['-Wno-unused-local-typedefs'] } ], 'HEADERS': [ diff --git a/native_client_sdk/src/libraries/gtest/library.dsc b/native_client_sdk/src/libraries/gtest/library.dsc index 310feb1..d0d6d0d 100644 --- a/native_client_sdk/src/libraries/gtest/library.dsc +++ b/native_client_sdk/src/libraries/gtest/library.dsc @@ -21,13 +21,6 @@ 'gtest-typed-test.cc', 'nacl_gtest_dummy_sys.cc', ], - # Ignore warnings: - # gtest.cc:2555: error: enumeration value ‘COLOR_DEFAULT’ not handled in switch - # gtest-typed-test.h:239:47: error: anonymous variadic macros were introduced in C99 - # gtest-internal-inl.h:213:8: error: private field 'pretty_' is not used - 'CXXFLAGS': ['-Wno-switch-enum', '-Wno-variadic-macros', '-Wno-unused-private-field'], - 'CFLAGS_GCC': ['-Wno-unused-local-typedefs'], - 'INCLUDES': [ # See comment below about gtest-internal-inl.h '$(NACL_SDK_ROOT)/include/gtest/internal', diff --git a/native_client_sdk/src/tests/nacl_io_socket_test/example.dsc b/native_client_sdk/src/tests/nacl_io_socket_test/example.dsc index 60b1887..80f3f13 100644 --- a/native_client_sdk/src/tests/nacl_io_socket_test/example.dsc +++ b/native_client_sdk/src/tests/nacl_io_socket_test/example.dsc @@ -15,8 +15,7 @@ # referenced before ppapi. 'LIBS': ['gmock', 'ppapi_cpp', 'ppapi', 'gtest', 'pthread'], 'INCLUDES': ['$(NACL_SDK_ROOT)/include/gtest/internal'], - 'CXXFLAGS': ['-Wno-sign-compare', '-Wno-unused-private-field'], - 'CFLAGS_GCC': ['-Wno-unused-local-typedefs'], + 'CXXFLAGS': ['-Wno-sign-compare'] } ], 'DATA': [ diff --git a/native_client_sdk/src/tests/nacl_io_test/example.dsc b/native_client_sdk/src/tests/nacl_io_test/example.dsc index 908ef17..d270b0f 100644 --- a/native_client_sdk/src/tests/nacl_io_test/example.dsc +++ b/native_client_sdk/src/tests/nacl_io_test/example.dsc @@ -46,8 +46,7 @@ # referenced before ppapi. 'LIBS': ['gmock', 'ppapi_cpp', 'ppapi', 'gtest', 'pthread'], 'INCLUDES': ['$(NACL_SDK_ROOT)/include/gtest/internal'], - 'CXXFLAGS': ['-Wno-sign-compare', '-Wno-unused-private-field'], - 'CFLAGS_GCC': ['-Wno-unused-local-typedefs'], + 'CXXFLAGS': ['-Wno-sign-compare'], } ], 'DATA': [ diff --git a/native_client_sdk/src/tests/nacl_io_test/pepper_interface_mock.cc b/native_client_sdk/src/tests/nacl_io_test/pepper_interface_mock.cc index 18f14ef..0684111 100644 --- a/native_client_sdk/src/tests/nacl_io_test/pepper_interface_mock.cc +++ b/native_client_sdk/src/tests/nacl_io_test/pepper_interface_mock.cc @@ -5,22 +5,17 @@ #include "pepper_interface_mock.h" PepperInterfaceMock::PepperInterfaceMock(PP_Instance instance) - : instance_(instance), - + : instance_(instance) { // Initialize interfaces. #include "nacl_io/pepper/undef_macros.h" #include "nacl_io/pepper/define_empty_macros.h" #undef BEGIN_INTERFACE #define BEGIN_INTERFACE(BaseClass, PPInterface, InterfaceString) \ - BaseClass##interface_(new BaseClass##Mock), + BaseClass##interface_ = new BaseClass##Mock; #include "nacl_io/pepper/all_interfaces.h" - - // Dummy value so we can ensure that no interface ends the initializer list. - dummy_(0) { } PepperInterfaceMock::~PepperInterfaceMock() { - // Delete interfaces. #include "nacl_io/pepper/undef_macros.h" #include "nacl_io/pepper/define_empty_macros.h" diff --git a/native_client_sdk/src/tests/nacl_io_test/pepper_interface_mock.h b/native_client_sdk/src/tests/nacl_io_test/pepper_interface_mock.h index 9e610bd..2c5a5b0 100644 --- a/native_client_sdk/src/tests/nacl_io_test/pepper_interface_mock.h +++ b/native_client_sdk/src/tests/nacl_io_test/pepper_interface_mock.h @@ -58,8 +58,6 @@ class PepperInterfaceMock : public nacl_io::PepperInterface { #define BEGIN_INTERFACE(BaseClass, PPInterface, InterfaceString) \ BaseClass##Mock* BaseClass##interface_; #include "nacl_io/pepper/all_interfaces.h" - - int dummy_; }; diff --git a/native_client_sdk/src/tests/sdk_util_test/example.dsc b/native_client_sdk/src/tests/sdk_util_test/example.dsc index 2073d3f..26fa010 100644 --- a/native_client_sdk/src/tests/sdk_util_test/example.dsc +++ b/native_client_sdk/src/tests/sdk_util_test/example.dsc @@ -15,8 +15,7 @@ # referenced before ppapi. 'LIBS': ['gmock', 'ppapi_cpp', 'ppapi', 'gtest', 'pthread'], 'INCLUDES': ['$(NACL_SDK_ROOT)/include/gtest/internal'], - 'CXXFLAGS': ['-Wno-sign-compare', '-Wno-unused-private-field'], - 'CFLAGS_GCC': ['-Wno-unused-local-typedefs'], + 'CXXFLAGS': ['-Wno-sign-compare'] } ], 'DATA': [ |