diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 15:25:41 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:26 +0200 |
commit | bff4c13475957863bfa7da5bc3bcf82a64a7503a (patch) | |
tree | 23530ecc27cb8d46b26d5d4aea6b058e5fbaf9db /binaryurp | |
parent | 27491c28cb67ada0a4c5eaa90eaf589425990582 (diff) |
Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code
Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3
Diffstat (limited to 'binaryurp')
-rw-r--r-- | binaryurp/source/bridge.cxx | 8 | ||||
-rw-r--r-- | binaryurp/source/bridge.hxx | 4 | ||||
-rw-r--r-- | binaryurp/source/bridgefactory.hxx | 4 | ||||
-rw-r--r-- | binaryurp/source/cache.hxx | 4 | ||||
-rw-r--r-- | binaryurp/source/incomingreply.hxx | 4 | ||||
-rw-r--r-- | binaryurp/source/incomingrequest.hxx | 4 | ||||
-rw-r--r-- | binaryurp/source/marshal.hxx | 4 | ||||
-rw-r--r-- | binaryurp/source/outgoingrequests.hxx | 4 | ||||
-rw-r--r-- | binaryurp/source/proxy.hxx | 4 | ||||
-rw-r--r-- | binaryurp/source/readerstate.hxx | 4 | ||||
-rw-r--r-- | binaryurp/source/unmarshal.hxx | 4 | ||||
-rw-r--r-- | binaryurp/source/writerstate.hxx | 4 |
12 files changed, 26 insertions, 26 deletions
diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx index 54214c393dd5..1534faf186e1 100644 --- a/binaryurp/source/bridge.cxx +++ b/binaryurp/source/bridge.cxx @@ -107,8 +107,8 @@ public: rtl::ByteSequence getTid() throw () { return tid_;} private: - AttachThread(const AttachThread&) SAL_DELETED_FUNCTION; - AttachThread& operator=(const AttachThread&) SAL_DELETED_FUNCTION; + AttachThread(const AttachThread&) = delete; + AttachThread& operator=(const AttachThread&) = delete; uno_ThreadPool threadPool_; rtl::ByteSequence tid_; @@ -138,8 +138,8 @@ public: void clear(); private: - PopOutgoingRequest(const PopOutgoingRequest&) SAL_DELETED_FUNCTION; - PopOutgoingRequest& operator=(const PopOutgoingRequest&) SAL_DELETED_FUNCTION; + PopOutgoingRequest(const PopOutgoingRequest&) = delete; + PopOutgoingRequest& operator=(const PopOutgoingRequest&) = delete; OutgoingRequests & requests_; rtl::ByteSequence tid_; diff --git a/binaryurp/source/bridge.hxx b/binaryurp/source/bridge.hxx index 1fe1bd6b5e3c..a35f7d16612b 100644 --- a/binaryurp/source/bridge.hxx +++ b/binaryurp/source/bridge.hxx @@ -169,8 +169,8 @@ public: bool isCurrentContextMode(); private: - Bridge(const Bridge&) SAL_DELETED_FUNCTION; - Bridge& operator=(const Bridge&) SAL_DELETED_FUNCTION; + Bridge(const Bridge&) = delete; + Bridge& operator=(const Bridge&) = delete; virtual ~Bridge(); diff --git a/binaryurp/source/bridgefactory.hxx b/binaryurp/source/bridgefactory.hxx index ac13ace16574..f7103bdd3aeb 100644 --- a/binaryurp/source/bridgefactory.hxx +++ b/binaryurp/source/bridgefactory.hxx @@ -75,8 +75,8 @@ public: using BridgeFactoryBase::release; private: - BridgeFactory(const BridgeFactory&) SAL_DELETED_FUNCTION; - BridgeFactory& operator=(const BridgeFactory&) SAL_DELETED_FUNCTION; + BridgeFactory(const BridgeFactory&) = delete; + BridgeFactory& operator=(const BridgeFactory&) = delete; explicit BridgeFactory( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > diff --git a/binaryurp/source/cache.hxx b/binaryurp/source/cache.hxx index 97e246ec2655..9df738f03ba2 100644 --- a/binaryurp/source/cache.hxx +++ b/binaryurp/source/cache.hxx @@ -80,8 +80,8 @@ public: } private: - Cache(const Cache&) SAL_DELETED_FUNCTION; - Cache& operator=(const Cache&) SAL_DELETED_FUNCTION; + Cache(const Cache&) = delete; + Cache& operator=(const Cache&) = delete; typedef std::list<T> LruList; // last recently used list typedef typename LruList::iterator LruListIt; diff --git a/binaryurp/source/incomingreply.hxx b/binaryurp/source/incomingreply.hxx index 7584ded5c3fa..f051387bc41d 100644 --- a/binaryurp/source/incomingreply.hxx +++ b/binaryurp/source/incomingreply.hxx @@ -30,8 +30,8 @@ namespace binaryurp { struct IncomingReply { private: - IncomingReply(const IncomingReply&) SAL_DELETED_FUNCTION; - IncomingReply& operator=(const IncomingReply&) SAL_DELETED_FUNCTION; + IncomingReply(const IncomingReply&) = delete; + IncomingReply& operator=(const IncomingReply&) = delete; public: IncomingReply( bool theException, BinaryAny const & theReturnValue, diff --git a/binaryurp/source/incomingrequest.hxx b/binaryurp/source/incomingrequest.hxx index 0b8c4d13e249..64b5664bd7b0 100644 --- a/binaryurp/source/incomingrequest.hxx +++ b/binaryurp/source/incomingrequest.hxx @@ -40,8 +40,8 @@ namespace binaryurp { class IncomingRequest { private: - IncomingRequest(const IncomingRequest&) SAL_DELETED_FUNCTION; - IncomingRequest& operator=(const IncomingRequest&) SAL_DELETED_FUNCTION; + IncomingRequest(const IncomingRequest&) = delete; + IncomingRequest& operator=(const IncomingRequest&) = delete; public: IncomingRequest( rtl::Reference< Bridge > const & bridge, rtl::ByteSequence const & tid, diff --git a/binaryurp/source/marshal.hxx b/binaryurp/source/marshal.hxx index da78a787839a..4a20395423f2 100644 --- a/binaryurp/source/marshal.hxx +++ b/binaryurp/source/marshal.hxx @@ -68,8 +68,8 @@ public: std::vector< unsigned char > * buffer, rtl::ByteSequence const & tid); private: - Marshal(const Marshal&) SAL_DELETED_FUNCTION; - Marshal& operator=(const Marshal&) SAL_DELETED_FUNCTION; + Marshal(const Marshal&) = delete; + Marshal& operator=(const Marshal&) = delete; void writeValue( std::vector< unsigned char > * buffer, diff --git a/binaryurp/source/outgoingrequests.hxx b/binaryurp/source/outgoingrequests.hxx index e3c92bd00b91..f774dab7c438 100644 --- a/binaryurp/source/outgoingrequests.hxx +++ b/binaryurp/source/outgoingrequests.hxx @@ -45,8 +45,8 @@ public: void pop(rtl::ByteSequence const & tid) throw (); private: - OutgoingRequests(const OutgoingRequests&) SAL_DELETED_FUNCTION; - OutgoingRequests& operator=(const OutgoingRequests&) SAL_DELETED_FUNCTION; + OutgoingRequests(const OutgoingRequests&) = delete; + OutgoingRequests& operator=(const OutgoingRequests&) = delete; typedef std::map< rtl::ByteSequence, std::vector< OutgoingRequest > > Map; diff --git a/binaryurp/source/proxy.hxx b/binaryurp/source/proxy.hxx index 7a758dd3e23d..7f90f116c137 100644 --- a/binaryurp/source/proxy.hxx +++ b/binaryurp/source/proxy.hxx @@ -63,8 +63,8 @@ public: OUString * oid); private: - Proxy(const Proxy&) SAL_DELETED_FUNCTION; - Proxy& operator=(const Proxy&) SAL_DELETED_FUNCTION; + Proxy(const Proxy&) = delete; + Proxy& operator=(const Proxy&) = delete; ~Proxy(); diff --git a/binaryurp/source/readerstate.hxx b/binaryurp/source/readerstate.hxx index 1ce1d5a4b783..879b0851279f 100644 --- a/binaryurp/source/readerstate.hxx +++ b/binaryurp/source/readerstate.hxx @@ -32,8 +32,8 @@ namespace binaryurp { struct ReaderState { private: - ReaderState(const ReaderState&) SAL_DELETED_FUNCTION; - ReaderState& operator=(const ReaderState&) SAL_DELETED_FUNCTION; + ReaderState(const ReaderState&) = delete; + ReaderState& operator=(const ReaderState&) = delete; public: ReaderState() {} diff --git a/binaryurp/source/unmarshal.hxx b/binaryurp/source/unmarshal.hxx index 3c523aa3f637..0cbb1193c9ed 100644 --- a/binaryurp/source/unmarshal.hxx +++ b/binaryurp/source/unmarshal.hxx @@ -65,8 +65,8 @@ public: void done() const; private: - Unmarshal(const Unmarshal&) SAL_DELETED_FUNCTION; - Unmarshal& operator=(const Unmarshal&) SAL_DELETED_FUNCTION; + Unmarshal(const Unmarshal&) = delete; + Unmarshal& operator=(const Unmarshal&) = delete; void check(sal_Int32 size) const; diff --git a/binaryurp/source/writerstate.hxx b/binaryurp/source/writerstate.hxx index 7ae457c46c8e..94207959a5a8 100644 --- a/binaryurp/source/writerstate.hxx +++ b/binaryurp/source/writerstate.hxx @@ -32,8 +32,8 @@ namespace binaryurp { struct WriterState { private: - WriterState(const WriterState&) SAL_DELETED_FUNCTION; - WriterState& operator=(const WriterState&) SAL_DELETED_FUNCTION; + WriterState(const WriterState&) = delete; + WriterState& operator=(const WriterState&) = delete; public: WriterState(): typeCache(cache::size), oidCache(cache::size), tidCache(cache::size) {} |