[Libreoffice-commits] core.git: avmedia/source

[Tor Lillqvist]

 avmedia/source/vlc/wrapper/EventHandler.hxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ed624d7f9c63c19e92862a926641103f9bdec071
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Sep 9 09:56:21 2013 +0300

    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

diff --git a/avmedia/source/vlc/wrapper/EventHandler.hxx b/avmedia/source/vlc/wrapper/EventHandler.hxx
index fbf5069..31bc004 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: */