summaryrefslogtreecommitdiffstats
path: root/webkit/plugins
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-11 19:20:19 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-11 19:20:19 +0000
commit9f95c698d1ff00be5c3b963baaba26d3c15757b2 (patch)
tree1f2bdfcdd46f1c157cac552ae3e5d4f7759878d4 /webkit/plugins
parent66e7b1bff613404b670b7c309d15e7055ed0236a (diff)
downloadchromium_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 'webkit/plugins')
-rw-r--r--webkit/plugins/npapi/test/plugin_schedule_timer_test.cc6
-rw-r--r--webkit/plugins/npapi/test/plugin_schedule_timer_test.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/webkit/plugins/npapi/test/plugin_schedule_timer_test.cc b/webkit/plugins/npapi/test/plugin_schedule_timer_test.cc
index 82725ee..db66a72 100644
--- a/webkit/plugins/npapi/test/plugin_schedule_timer_test.cc
+++ b/webkit/plugins/npapi/test/plugin_schedule_timer_test.cc
@@ -48,7 +48,7 @@ NPError ScheduleTimerTest::New(
return error;
start_time_ = Time::Now();
- HandleEvent(0);
+ HandleEventIndex(0);
return NPERR_NO_ERROR;
}
@@ -66,7 +66,7 @@ void ScheduleTimerTest::OnTimer(uint32 timer_id) {
return;
}
- HandleEvent(event_index);
+ HandleEventIndex(event_index);
// Finish test if all events have happened.
if (num_received_events_ == kNumEvents)
@@ -94,7 +94,7 @@ void OnTimerHelper(NPP id, uint32 timer_id) {
}
}
-void ScheduleTimerTest::HandleEvent(int event_index) {
+void ScheduleTimerTest::HandleEventIndex(int event_index) {
const Event& event = schedule_[event_index];
// Mark event as received.
diff --git a/webkit/plugins/npapi/test/plugin_schedule_timer_test.h b/webkit/plugins/npapi/test/plugin_schedule_timer_test.h
index 78fae91..13ed593 100644
--- a/webkit/plugins/npapi/test/plugin_schedule_timer_test.h
+++ b/webkit/plugins/npapi/test/plugin_schedule_timer_test.h
@@ -56,7 +56,7 @@ class ScheduleTimerTest : public PluginTest {
// Returns index of matching unreceived event or -1 if not found.
int FindUnreceivedEvent(int time, uint32 timer_id);
- void HandleEvent(int event_index);
+ void HandleEventIndex(int event_index);
};
} // namespace NPAPIClient