diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 16:04:04 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:29 +0200 |
commit | b36963c0a6a09f70ca6d8d607dd3249a3496497d (patch) | |
tree | 33e06dc8d227957cb31355277fb5cf20b9918628 /io/source/acceptor | |
parent | HAVE_CXX11_OVERRIDE is required on all supported toolchains (diff) | |
download | core-b36963c0a6a09f70ca6d8d607dd3249a3496497d.tar.gz core-b36963c0a6a09f70ca6d8d607dd3249a3496497d.zip |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'io/source/acceptor')
-rw-r--r-- | io/source/acceptor/acc_pipe.cxx | 10 | ||||
-rw-r--r-- | io/source/acceptor/acc_socket.cxx | 14 | ||||
-rw-r--r-- | io/source/acceptor/acceptor.cxx | 10 |
3 files changed, 17 insertions, 17 deletions
diff --git a/io/source/acceptor/acc_pipe.cxx b/io/source/acceptor/acc_pipe.cxx index 8fb7505a7ee3..9ca89e43511e 100644 --- a/io/source/acceptor/acc_pipe.cxx +++ b/io/source/acceptor/acc_pipe.cxx @@ -47,18 +47,18 @@ namespace io_acceptor virtual sal_Int32 SAL_CALL read( Sequence< sal_Int8 >& aReadBytes, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL write( const Sequence< sal_Int8 >& aData ) throw(::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL flush( ) throw( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL close( ) throw(::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getDescription( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; public: ::osl::StreamPipe m_pipe; oslInterlockedCount m_nStatus; diff --git a/io/source/acceptor/acc_socket.cxx b/io/source/acceptor/acc_socket.cxx index 96cfb369a03a..e5bdf63daf4d 100644 --- a/io/source/acceptor/acc_socket.cxx +++ b/io/source/acceptor/acc_socket.cxx @@ -75,24 +75,24 @@ namespace io_acceptor { virtual sal_Int32 SAL_CALL read( ::com::sun::star::uno::Sequence< sal_Int8 >& aReadBytes, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL write( const ::com::sun::star::uno::Sequence< sal_Int8 >& aData ) throw(::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL flush( ) throw( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL close( ) throw(::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getDescription( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XConnectionBroadcaster virtual void SAL_CALL addStreamListener(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>& aListener) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeStreamListener(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>& aListener) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; public: void completeConnectionString(); diff --git a/io/source/acceptor/acceptor.cxx b/io/source/acceptor/acceptor.cxx index 1c4b2301c351..43c86cd8bf75 100644 --- a/io/source/acceptor/acceptor.cxx +++ b/io/source/acceptor/acceptor.cxx @@ -57,13 +57,13 @@ namespace io_acceptor throw( AlreadyAcceptingException, ConnectionSetupException, IllegalArgumentException, - RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL stopAccepting( ) throw( RuntimeException, std::exception) SAL_OVERRIDE; + RuntimeException, std::exception) override; + virtual void SAL_CALL stopAccepting( ) throw( RuntimeException, std::exception) override; public: // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(std::exception) SAL_OVERRIDE; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(std::exception) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception) override; private: PipeAcceptor *m_pPipe; |