[Libreoffice-commits] core.git: include/comphelper include/vcl

[Libreoffice Gerrit user]

 include/comphelper/interfacecontainer2.hxx |   12 ++++--------
 include/vcl/scheduler.hxx                  |    2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

New commits:
commit 2369b23256df2e910722800f14aec4eba41b6f5d
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Sep 20 11:15:49 2018 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Sep 20 13:05:01 2018 +0200

    Replace SAL_DELETED_FUNCTION with = delete in internal code
    
    Change-Id: I23399a4d1869635c8b6ffeb25bd183b0504b448d
    Reviewed-on: https://gerrit.libreoffice.org/60801
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/include/comphelper/interfacecontainer2.hxx b/include/comphelper/interfacecontainer2.hxx
index 60bf7e74a1db..22c1277e5fe0 100644
--- a/include/comphelper/interfacecontainer2.hxx
+++ b/include/comphelper/interfacecontainer2.hxx
@@ -109,10 +109,8 @@ private:
     detail::element_alias2       aData;
     sal_Int32                    nRemain;
 
-    OInterfaceIteratorHelper2( const OInterfaceIteratorHelper2 & )
-        SAL_DELETED_FUNCTION;
-    OInterfaceIteratorHelper2 &  operator = ( const OInterfaceIteratorHelper2 & )
-        SAL_DELETED_FUNCTION;
+    OInterfaceIteratorHelper2( const OInterfaceIteratorHelper2 & ) = delete;
+    OInterfaceIteratorHelper2 &  operator = ( const OInterfaceIteratorHelper2 & ) = delete;
 };
 
 
@@ -235,10 +233,8 @@ friend class OInterfaceIteratorHelper2;
     /** TRUE -> aData.pAsVector is of type Sequence< XInterfaceSequence >. */
     bool                    bIsList;
 
-    OInterfaceContainerHelper2( const OInterfaceContainerHelper2 & )
-        SAL_DELETED_FUNCTION;
-    OInterfaceContainerHelper2 & operator = ( const OInterfaceContainerHelper2 & )
-        SAL_DELETED_FUNCTION;
+    OInterfaceContainerHelper2( const OInterfaceContainerHelper2 & ) = delete;
+    OInterfaceContainerHelper2 & operator = ( const OInterfaceContainerHelper2 & ) = delete;
 
     /*
       Duplicate content of the container and release the old one without destroying.
diff --git a/include/vcl/scheduler.hxx b/include/vcl/scheduler.hxx
index 6233d134a8ed..0d0d58962185 100644
--- a/include/vcl/scheduler.hxx
+++ b/include/vcl/scheduler.hxx
@@ -32,7 +32,7 @@ class VCL_DLLPUBLIC Scheduler final
 {
     friend class SchedulerGuard;
     friend class Task;
-    Scheduler() SAL_DELETED_FUNCTION;
+    Scheduler() = delete;
 
     static inline void UpdateSystemTimer( ImplSchedulerContext &rSchedCtx,
                                           sal_uInt64 nMinPeriod,