diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-09-09 09:56:21 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-09-09 09:57:34 +0300 |
| commit | ed624d7f9c63c19e92862a926641103f9bdec071 (patch) | |
| tree | 14835af467a3af038f5273f0008d172e971ff4a3 /avmedia/source | |
| parent | 6031d34ec26b988853c4b317945b3b4256813cbc (diff) | |
Use consistent calling convention: SAL_CALL
Fixes error C2695: 'VLC::EventHandler::run': overriding virtual
function differs from 'osl::Thread::run' only by calling convention.
Change-Id: Ie6c9bd9a2f5e6830dc70ded29839cd5b4b4b0445
Diffstat (limited to 'avmedia/source')
| -rw-r--r-- | avmedia/source/vlc/wrapper/EventHandler.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/avmedia/source/vlc/wrapper/EventHandler.hxx b/avmedia/source/vlc/wrapper/EventHandler.hxx index fbf506987714..31bc0048f3cf 100644 --- a/avmedia/source/vlc/wrapper/EventHandler.hxx +++ b/avmedia/source/vlc/wrapper/EventHandler.hxx @@ -22,7 +22,7 @@ namespace VLC void stop(); protected: - virtual void run(); + virtual void SAL_CALL run(); public: typedef boost::function< void() > TCallback; @@ -32,4 +32,4 @@ namespace VLC #endif // _WRAPPER_EVENT_HANDLER_HXX -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |