diff options
author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-11 19:20:19 +0000 |
---|---|---|
committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-11 19:20:19 +0000 |
commit | 9f95c698d1ff00be5c3b963baaba26d3c15757b2 (patch) | |
tree | 1f2bdfcdd46f1c157cac552ae3e5d4f7759878d4 /media/audio/linux | |
parent | 66e7b1bff613404b670b7c309d15e7055ed0236a (diff) | |
download | chromium_src-9f95c698d1ff00be5c3b963baaba26d3c15757b2.zip chromium_src-9f95c698d1ff00be5c3b963baaba26d3c15757b2.tar.gz chromium_src-9f95c698d1ff00be5c3b963baaba26d3c15757b2.tar.bz2 |
clang: Fix several -Woverloaded-virtual warnings.
Real bugs:
net/http/http_network_transaction_unittest.cc:273:16:error: 'net::CaptureGroupNameSocketPool<net::HttpProxyClientSocketPool>::ReleaseSocket' hides overloaded virtual function [-Woverloaded-virtual]
virtual void ReleaseSocket(const std::string& group_name,
^
net/http/http_network_transaction_unittest.cc:310:1: note: in instantiation of template class 'net::CaptureGroupNameSocketPool<net::HttpProxyClientSocketPool>' requested here
CaptureGroupNameHttpProxySocketPool::CaptureGroupNameSocketPool(
^
In file included from ./net/http/http_network_session_peer.h:10:
./net/http/http_proxy_client_socket_pool.h:200:16: note: hidden overloaded virtual function 'net::HttpProxyClientSocketPool::ReleaseSocket' declared here
virtual void ReleaseSocket(const std::string& group_name,
^
net/http/http_network_transaction_unittest.cc:273:16:error: 'net::CaptureGroupNameSocketPool<net::SSLClientSocketPool>::ReleaseSocket' hides overloaded virtual function [-Woverloaded-virtual]
virtual void ReleaseSocket(const std::string& group_name,
^
net/http/http_network_transaction_unittest.cc:316:1: note: in instantiation of template class 'net::CaptureGroupNameSocketPool<net::SSLClientSocketPool>' requested here
CaptureGroupNameSSLSocketPool::CaptureGroupNameSocketPool(
^
In file included from ./net/http/http_network_session_peer.h:12:
./net/socket/ssl_client_socket_pool.h:208:16: note: hidden overloaded virtual function 'net::SSLClientSocketPool::ReleaseSocket' declared here
virtual void ReleaseSocket(const std::string& group_name,
^
net/http/http_network_transaction_unittest.cc:273:16:error: 'net::CaptureGroupNameSocketPool<net::TCPClientSocketPool>::ReleaseSocket' hides overloaded virtual function [-Woverloaded-virtual]
virtual void ReleaseSocket(const std::string& group_name,
^
net/http/http_network_transaction_unittest.cc:5511:13: note: in instantiation of template class 'net::CaptureGroupNameSocketPool<net::TCPClientSocketPool>' requested here
new CaptureGroupNameTCPSocketPool(NULL, NULL);
^
In file included from ./net/socket/socket_test_util.h:34:
./net/socket/tcp_client_socket_pool.h:134:16: note: hidden overloaded virtual function 'net::TCPClientSocketPool::ReleaseSocket' declared here
virtual void ReleaseSocket(const std::string& group_name,
^
net/http/http_network_transaction_unittest.cc:273:16:error: 'net::CaptureGroupNameSocketPool<net::SOCKSClientSocketPool>::ReleaseSocket' hides overloaded virtual function [-Woverloaded-virtual]
virtual void ReleaseSocket(const std::string& group_name,
^
net/http/http_network_transaction_unittest.cc:5630:13: note: in instantiation of template class 'net::CaptureGroupNameSocketPool<net::SOCKSClientSocketPool>' requested here
new CaptureGroupNameSOCKSSocketPool(NULL, NULL);
^
In file included from ./net/http/http_network_session_peer.h:11:
./net/socket/socks_client_socket_pool.h:133:16: note: hidden overloaded virtual function 'net::SOCKSClientSocketPool::ReleaseSocket' declared here
virtual void ReleaseSocket(const std::string& group_name,
^
CXX(target) out/Debug/obj.target/net_unittests/net/http/http_response_body_drainer_unittest.o
4 errors generated.
net/http/http_stream_factory_unittest.cc:126:16:error: 'net::<anonymous namespace>::CapturePreconnectsSocketPool<net::HttpProxyClientSocketPool>::ReleaseSocket' hides overloaded virtual function [-Woverloaded-virtual]
virtual void ReleaseSocket(const std::string& group_name,
^
net/http/http_stream_factory_unittest.cc:170:1: note: in instantiation of template class 'net::<anonymous>::CapturePreconnectsSocketPool<net::HttpProxyClientSocketPool>' requested here
CapturePreconnectsHttpProxySocketPool::CapturePreconnectsSocketPool(
^
In file included from ./net/http/http_network_session_peer.h:10:
./net/http/http_proxy_client_socket_pool.h:200:16: note: hidden overloaded virtual function 'net::HttpProxyClientSocketPool::ReleaseSocket' declared here
virtual void ReleaseSocket(const std::string& group_name,
^
net/http/http_stream_factory_unittest.cc:126:16:error: 'net::<anonymous namespace>::CapturePreconnectsSocketPool<net::SSLClientSocketPool>::ReleaseSocket' hides overloaded virtual function [-Woverloaded-virtual]
virtual void ReleaseSocket(const std::string& group_name,
^
net/http/http_stream_factory_unittest.cc:176:1: note: in instantiation of template class 'net::<anonymous>::CapturePreconnectsSocketPool<net::SSLClientSocketPool>' requested here
CapturePreconnectsSSLSocketPool::CapturePreconnectsSocketPool(
^
In file included from ./net/http/http_network_session_peer.h:12:
./net/socket/ssl_client_socket_pool.h:208:16: note: hidden overloaded virtual function 'net::SSLClientSocketPool::ReleaseSocket' declared here
virtual void ReleaseSocket(const std::string& group_name,
^
net/http/http_stream_factory_unittest.cc:126:16:error: 'net::<anonymous namespace>::CapturePreconnectsSocketPool<net::TCPClientSocketPool>::ReleaseSocket' hides overloaded virtual function [-Woverloaded-virtual]
virtual void ReleaseSocket(const std::string& group_name,
^
net/http/http_stream_factory_unittest.cc:188:13: note: in instantiation of template class 'net::<anonymous>::CapturePreconnectsSocketPool<net::TCPClientSocketPool>' requested here
new CapturePreconnectsTCPSocketPool(
^
In file included from ./net/socket/socket_test_util.h:34:
./net/socket/tcp_client_socket_pool.h:134:16: note: hidden overloaded virtual function 'net::TCPClientSocketPool::ReleaseSocket' declared here
virtual void ReleaseSocket(const std::string& group_name,
^
net/http/http_stream_factory_unittest.cc:126:16:error: 'net::<anonymous namespace>::CapturePreconnectsSocketPool<net::SOCKSClientSocketPool>::ReleaseSocket' hides overloaded virtual function [-Woverloaded-virtual]
virtual void ReleaseSocket(const std::string& group_name,
^
net/http/http_stream_factory_unittest.cc:237:13: note: in instantiation of template class 'net::<anonymous>::CapturePreconnectsSocketPool<net::SOCKSClientSocketPool>' requested here
new CapturePreconnectsSOCKSSocketPool(
^
In file included from net/http/http_stream_factory_unittest.cc:17:
In file included from ./net/http/http_network_session_peer.h:11:
./net/socket/socks_client_socket_pool.h:133:16: note: hidden overloaded virtual function 'net::SOCKSClientSocketPool::ReleaseSocket' declared here
virtual void ReleaseSocket(const std::string& group_name,
^
CXX(target) out/Debug/obj.target/net_unittests/net/http/http_vary_data_unittest.o
4 errors generated.
make: *** [out/Debug/obj.target/net_unittests/net/http/http_stream_factory_unittest.o] Error 1
media/audio/linux/alsa_output_unittest.cc:83:3:error: 'MockAudioManagerLinux::MakeAudioInputStream' hides overloaded virtual function [-Woverloaded-virtual]
MOCK_METHOD5(MakeAudioInputStream, AudioInputStream*(
^
In file included from media/audio/linux/alsa_output_unittest.cc:12:
In file included from ./testing/gmock/include/gmock/gmock.h:61:
testing/gmock/include/gmock/gmock-generated-function-mockers.h:632:28: note: instantiated from:
^
media/audio/linux/alsa_output_unittest.cc:83:3: note: instantiated from:
MOCK_METHOD5(MakeAudioInputStream, AudioInputStream*(
^
media/audio/linux/alsa_output_unittest.cc:83:16: note: instantiated from:
MOCK_METHOD5(MakeAudioInputStream, AudioInputStream*(
^
In file included from media/audio/linux/alsa_output_unittest.cc:9:
./media/audio/linux/audio_manager_linux.h:30:29: note: hidden overloaded virtual function 'AudioManagerLinux::MakeAudioInputStream' declared here
virtual AudioInputStream* MakeAudioInputStream(AudioParameters params);
^
CXX(target) out/Debug/obj.target/media_unittests/media/base/data_buffer_unittest.o
CXX(target) out/Debug/obj.target/media_unittests/media/base/djb2_unittest.o
1 error generated.
No bug, just confusing:
In file included from webkit/plugins/npapi/test/plugin_schedule_timer_test.cc:5:
./webkit/plugins/npapi/test/plugin_schedule_timer_test.h:59:8:error: 'NPAPIClient::ScheduleTimerTest::HandleEvent' hides overloaded virtual function [-Woverloaded-virtual]
void HandleEvent(int event_index);
^
In file included from webkit/plugins/npapi/test/plugin_schedule_timer_test.cc:5:
In file included from ./webkit/plugins/npapi/test/plugin_schedule_timer_test.h:9:
./webkit/plugins/npapi/test/plugin_test.h:43:19: note: hidden overloaded virtual function 'NPAPIClient::PluginTest::HandleEvent' declared here
virtual int16 HandleEvent(void* event);
^
1 error generated.
make: *** [out/Debug/obj.target/npapi_test_plugin/webkit/plugins/npapi/test/plugin_schedule_timer_test.o] Error 1
CXX(target) out/Debug/obj.target/npapi_test_plugin/webkit/plugins/npapi/test/plugin_private_test.o
CXX(target) out/Debug/obj.target/npapi_test_plugin/webkit/plugins/npapi/test/plugin_test_factory.o
In file included from webkit/plugins/npapi/test/plugin_test_factory.cc:17:
./webkit/plugins/npapi/test/plugin_schedule_timer_test.h:59:8:error: 'NPAPIClient::ScheduleTimerTest::HandleEvent' hides overloaded virtual function [-Woverloaded-virtual]
void HandleEvent(int event_index);
^
In file included from webkit/plugins/npapi/test/plugin_test_factory.cc:7:
In file included from ./webkit/plugins/npapi/test/plugin_arguments_test.h:8:
./webkit/plugins/npapi/test/plugin_test.h:43:19: note: hidden overloaded virtual function 'NPAPIClient::PluginTest::HandleEvent' declared here
virtual int16 HandleEvent(void* event);
^
1 error generated.
BUG=72205
TEST=none
Review URL: http://codereview.chromium.org/6503001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74642 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/linux')
-rw-r--r-- | media/audio/linux/alsa_output_unittest.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/media/audio/linux/alsa_output_unittest.cc b/media/audio/linux/alsa_output_unittest.cc index 83c0eff..832aa5f 100644 --- a/media/audio/linux/alsa_output_unittest.cc +++ b/media/audio/linux/alsa_output_unittest.cc @@ -80,12 +80,8 @@ class MockAudioManagerLinux : public AudioManagerLinux { MOCK_METHOD0(HasAudioInputDevices, bool()); MOCK_METHOD1(MakeAudioOutputStream, AudioOutputStream*( AudioParameters params)); - MOCK_METHOD5(MakeAudioInputStream, AudioInputStream*( - AudioParameters::Format format, - int channels, - int sample_rate, - char bits_per_sample, - uint32 samples_per_packet)); + MOCK_METHOD1(MakeAudioInputStream, AudioInputStream*( + AudioParameters params)); MOCK_METHOD0(MuteAll, void()); MOCK_METHOD0(UnMuteAll, void()); |