summaryrefslogtreecommitdiff
path: root/connectivity/source/inc
diff options
context:
space:
mode:
Diffstat (limited to 'connectivity/source/inc')
-rw-r--r--connectivity/source/inc/ParameterSubstitution.hxx4
-rw-r--r--connectivity/source/inc/RowFunctionParser.hxx4
-rw-r--r--connectivity/source/inc/ado/Aolevariant.hxx2
-rw-r--r--connectivity/source/inc/java/ContextClassLoader.hxx4
-rw-r--r--connectivity/source/inc/java/LocalRef.hxx4
-rw-r--r--connectivity/source/inc/java/lang/Object.hxx8
6 files changed, 13 insertions, 13 deletions
diff --git a/connectivity/source/inc/ParameterSubstitution.hxx b/connectivity/source/inc/ParameterSubstitution.hxx
index ecb2c59e3734..6dc66d6b99a1 100644
--- a/connectivity/source/inc/ParameterSubstitution.hxx
+++ b/connectivity/source/inc/ParameterSubstitution.hxx
@@ -38,8 +38,8 @@ namespace connectivity
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XConnection > m_xConnection;
- ParameterSubstitution( const ParameterSubstitution& ) SAL_DELETED_FUNCTION;
- ParameterSubstitution& operator=( const ParameterSubstitution& ) SAL_DELETED_FUNCTION;
+ ParameterSubstitution( const ParameterSubstitution& ) = delete;
+ ParameterSubstitution& operator=( const ParameterSubstitution& ) = delete;
public:
static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException);
diff --git a/connectivity/source/inc/RowFunctionParser.hxx b/connectivity/source/inc/RowFunctionParser.hxx
index a4f8d7d429b7..5eb3c36ccab9 100644
--- a/connectivity/source/inc/RowFunctionParser.hxx
+++ b/connectivity/source/inc/RowFunctionParser.hxx
@@ -121,8 +121,8 @@ private:
// supposed to be a singleton
FunctionParser();
- FunctionParser(const FunctionParser&) SAL_DELETED_FUNCTION;
- FunctionParser& operator=( const FunctionParser& ) SAL_DELETED_FUNCTION;
+ FunctionParser(const FunctionParser&) = delete;
+ FunctionParser& operator=( const FunctionParser& ) = delete;
};
diff --git a/connectivity/source/inc/ado/Aolevariant.hxx b/connectivity/source/inc/ado/Aolevariant.hxx
index 59c7735a7900..9d8f2d608c04 100644
--- a/connectivity/source/inc/ado/Aolevariant.hxx
+++ b/connectivity/source/inc/ado/Aolevariant.hxx
@@ -77,7 +77,7 @@ namespace connectivity
OLEVariant(const VARIANT& varSrc);
OLEVariant(const OLEVariant& varSrc) ;
OLEVariant(bool x) ;
- OLEVariant(sal_Bool) SAL_DELETED_FUNCTION;
+ OLEVariant(sal_Bool) = delete;
OLEVariant(sal_Int8 n) ;
OLEVariant(sal_Int16 n) ;
OLEVariant(sal_Int32 n) ;
diff --git a/connectivity/source/inc/java/ContextClassLoader.hxx b/connectivity/source/inc/java/ContextClassLoader.hxx
index 6d96a48e3e72..e426e6ca8ce2 100644
--- a/connectivity/source/inc/java/ContextClassLoader.hxx
+++ b/connectivity/source/inc/java/ContextClassLoader.hxx
@@ -64,8 +64,8 @@ namespace connectivity { namespace jdbc
}
private:
- ContextClassLoaderScope(ContextClassLoaderScope &) SAL_DELETED_FUNCTION;
- void operator =(ContextClassLoaderScope &) SAL_DELETED_FUNCTION;
+ ContextClassLoaderScope(ContextClassLoaderScope &) = delete;
+ void operator =(ContextClassLoaderScope &) = delete;
void pop( bool clearExceptions );
diff --git a/connectivity/source/inc/java/LocalRef.hxx b/connectivity/source/inc/java/LocalRef.hxx
index 765cbe9318b9..2e0369a384c0 100644
--- a/connectivity/source/inc/java/LocalRef.hxx
+++ b/connectivity/source/inc/java/LocalRef.hxx
@@ -76,8 +76,8 @@ namespace connectivity { namespace jdbc
bool is() const { return m_object != NULL; }
private:
- LocalRef(LocalRef &) SAL_DELETED_FUNCTION;
- void operator =(LocalRef &) SAL_DELETED_FUNCTION;
+ LocalRef(LocalRef &) = delete;
+ void operator =(LocalRef &) = delete;
protected:
JNIEnv& m_environment;
diff --git a/connectivity/source/inc/java/lang/Object.hxx b/connectivity/source/inc/java/lang/Object.hxx
index 0efa942752a2..f3b169e23950 100644
--- a/connectivity/source/inc/java/lang/Object.hxx
+++ b/connectivity/source/inc/java/lang/Object.hxx
@@ -44,8 +44,8 @@ namespace connectivity
class SDBThreadAttach
{
jvmaccess::VirtualMachine::AttachGuard m_aGuard;
- SDBThreadAttach(SDBThreadAttach&) SAL_DELETED_FUNCTION;
- SDBThreadAttach& operator= (SDBThreadAttach&) SAL_DELETED_FUNCTION;
+ SDBThreadAttach(SDBThreadAttach&) = delete;
+ SDBThreadAttach& operator= (SDBThreadAttach&) = delete;
public:
SDBThreadAttach();
~SDBThreadAttach();
@@ -66,8 +66,8 @@ namespace connectivity
class java_lang_Object
{
- java_lang_Object& operator= (java_lang_Object&) SAL_DELETED_FUNCTION;
- java_lang_Object(java_lang_Object&) SAL_DELETED_FUNCTION;
+ java_lang_Object& operator= (java_lang_Object&) = delete;
+ java_lang_Object(java_lang_Object&) = delete;
protected:
// The Java handle to this class