aboutsummaryrefslogtreecommitdiff
path: root/src/server/shared
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/shared')
-rw-r--r--src/server/shared/DataStores/DBCFileLoader.h4
-rw-r--r--src/server/shared/DataStores/DBCStore.h8
-rw-r--r--src/server/shared/Database/DatabaseWorker.h4
-rw-r--r--src/server/shared/Database/MySQLConnection.h4
-rw-r--r--src/server/shared/Database/PreparedStatement.h8
-rw-r--r--src/server/shared/Database/QueryResult.h8
-rw-r--r--src/server/shared/Database/SQLOperation.h4
-rw-r--r--src/server/shared/Define.h10
-rw-r--r--src/server/shared/Threading/Callback.h8
9 files changed, 24 insertions, 34 deletions
diff --git a/src/server/shared/DataStores/DBCFileLoader.h b/src/server/shared/DataStores/DBCFileLoader.h
index fac6ef4eef0..84ee6e93e68 100644
--- a/src/server/shared/DataStores/DBCFileLoader.h
+++ b/src/server/shared/DataStores/DBCFileLoader.h
@@ -92,7 +92,7 @@ class DBCFileLoader
unsigned char *data;
unsigned char *stringTable;
- DBCFileLoader(DBCFileLoader const& right) DELETE_MEMBER;
- DBCFileLoader& operator=(DBCFileLoader const& right) DELETE_MEMBER;
+ DBCFileLoader(DBCFileLoader const& right) = delete;
+ DBCFileLoader& operator=(DBCFileLoader const& right) = delete;
};
#endif
diff --git a/src/server/shared/DataStores/DBCStore.h b/src/server/shared/DataStores/DBCStore.h
index 198f64c5ebf..9d5836fcf0b 100644
--- a/src/server/shared/DataStores/DBCStore.h
+++ b/src/server/shared/DataStores/DBCStore.h
@@ -65,8 +65,8 @@ struct SqlDbc
}
private:
- SqlDbc(SqlDbc const& right) DELETE_MEMBER;
- SqlDbc& operator=(SqlDbc const& right) DELETE_MEMBER;
+ SqlDbc(SqlDbc const& right) = delete;
+ SqlDbc& operator=(SqlDbc const& right) = delete;
};
template<class T>
@@ -296,8 +296,8 @@ class DBCStorage
T* dataTable;
StringPoolList stringPoolList;
- DBCStorage(DBCStorage const& right) DELETE_MEMBER;
- DBCStorage& operator=(DBCStorage const& right) DELETE_MEMBER;
+ DBCStorage(DBCStorage const& right) = delete;
+ DBCStorage& operator=(DBCStorage const& right) = delete;
};
#endif
diff --git a/src/server/shared/Database/DatabaseWorker.h b/src/server/shared/Database/DatabaseWorker.h
index 734ec790027..dc883dd3428 100644
--- a/src/server/shared/Database/DatabaseWorker.h
+++ b/src/server/shared/Database/DatabaseWorker.h
@@ -37,8 +37,8 @@ class DatabaseWorker : protected ACE_Task_Base
ACE_Activation_Queue* m_queue;
MySQLConnection* m_conn;
- DatabaseWorker(DatabaseWorker const& right) DELETE_MEMBER;
- DatabaseWorker& operator=(DatabaseWorker const& right) DELETE_MEMBER;
+ DatabaseWorker(DatabaseWorker const& right) = delete;
+ DatabaseWorker& operator=(DatabaseWorker const& right) = delete;
};
#endif
diff --git a/src/server/shared/Database/MySQLConnection.h b/src/server/shared/Database/MySQLConnection.h
index e55e3dfc23a..512df7c16c7 100644
--- a/src/server/shared/Database/MySQLConnection.h
+++ b/src/server/shared/Database/MySQLConnection.h
@@ -132,8 +132,8 @@ class MySQLConnection
ConnectionFlags m_connectionFlags; //! Connection flags (for preparing relevant statements)
ACE_Thread_Mutex m_Mutex;
- MySQLConnection(MySQLConnection const& right) DELETE_MEMBER;
- MySQLConnection& operator=(MySQLConnection const& right) DELETE_MEMBER;
+ MySQLConnection(MySQLConnection const& right) = delete;
+ MySQLConnection& operator=(MySQLConnection const& right) = delete;
};
#endif
diff --git a/src/server/shared/Database/PreparedStatement.h b/src/server/shared/Database/PreparedStatement.h
index 9ccd16e3d5c..6afb309db2c 100644
--- a/src/server/shared/Database/PreparedStatement.h
+++ b/src/server/shared/Database/PreparedStatement.h
@@ -102,8 +102,8 @@ class PreparedStatement
uint32 m_index;
std::vector<PreparedStatementData> statement_data; //- Buffer of parameters, not tied to MySQL in any way yet
- PreparedStatement(PreparedStatement const& right) DELETE_MEMBER;
- PreparedStatement& operator=(PreparedStatement const& right) DELETE_MEMBER;
+ PreparedStatement(PreparedStatement const& right) = delete;
+ PreparedStatement& operator=(PreparedStatement const& right) = delete;
};
//- Class of which the instances are unique per MySQLConnection
@@ -149,8 +149,8 @@ class MySQLPreparedStatement
std::vector<bool> m_paramsSet;
MYSQL_BIND* m_bind;
- MySQLPreparedStatement(MySQLPreparedStatement const& right) DELETE_MEMBER;
- MySQLPreparedStatement& operator=(MySQLPreparedStatement const& right) DELETE_MEMBER;
+ MySQLPreparedStatement(MySQLPreparedStatement const& right) = delete;
+ MySQLPreparedStatement& operator=(MySQLPreparedStatement const& right) = delete;
};
typedef ACE_Future<PreparedQueryResult> PreparedQueryResultFuture;
diff --git a/src/server/shared/Database/QueryResult.h b/src/server/shared/Database/QueryResult.h
index a09506c6621..4795fef4a4c 100644
--- a/src/server/shared/Database/QueryResult.h
+++ b/src/server/shared/Database/QueryResult.h
@@ -56,8 +56,8 @@ class ResultSet
MYSQL_RES* _result;
MYSQL_FIELD* _fields;
- ResultSet(ResultSet const& right) DELETE_MEMBER;
- ResultSet& operator=(ResultSet const& right) DELETE_MEMBER;
+ ResultSet(ResultSet const& right) = delete;
+ ResultSet& operator=(ResultSet const& right) = delete;
};
typedef Trinity::AutoPtr<ResultSet, ACE_Thread_Mutex> QueryResult;
@@ -103,8 +103,8 @@ class PreparedResultSet
void CleanUp();
bool _NextRow();
- PreparedResultSet(PreparedResultSet const& right) DELETE_MEMBER;
- PreparedResultSet& operator=(PreparedResultSet const& right) DELETE_MEMBER;
+ PreparedResultSet(PreparedResultSet const& right) = delete;
+ PreparedResultSet& operator=(PreparedResultSet const& right) = delete;
};
typedef Trinity::AutoPtr<PreparedResultSet, ACE_Thread_Mutex> PreparedQueryResult;
diff --git a/src/server/shared/Database/SQLOperation.h b/src/server/shared/Database/SQLOperation.h
index eb32b60c74d..6f933a051e3 100644
--- a/src/server/shared/Database/SQLOperation.h
+++ b/src/server/shared/Database/SQLOperation.h
@@ -71,8 +71,8 @@ class SQLOperation : public ACE_Method_Request
MySQLConnection* m_conn;
private:
- SQLOperation(SQLOperation const& right) DELETE_MEMBER;
- SQLOperation& operator=(SQLOperation const& right) DELETE_MEMBER;
+ SQLOperation(SQLOperation const& right) = delete;
+ SQLOperation& operator=(SQLOperation const& right) = delete;
};
#endif
diff --git a/src/server/shared/Define.h b/src/server/shared/Define.h
index 68ce6c6d6b4..0d62ccb4e83 100644
--- a/src/server/shared/Define.h
+++ b/src/server/shared/Define.h
@@ -70,16 +70,6 @@
# define ATTR_DEPRECATED
#endif //COMPILER == COMPILER_GNU
-#if COMPILER_HAS_CPP11_SUPPORT
-# define OVERRIDE override
-# define FINAL final
-# define DELETE_MEMBER = delete
-#else
-# define OVERRIDE
-# define FINAL
-# define DELETE_MEMBER
-#endif //COMPILER_HAS_CPP11_SUPPORT
-
#define UI64FMTD ACE_UINT64_FORMAT_SPECIFIER
#define UI64LIT(N) ACE_UINT64_LITERAL(N)
diff --git a/src/server/shared/Threading/Callback.h b/src/server/shared/Threading/Callback.h
index c3717228870..c48546bbf5c 100644
--- a/src/server/shared/Threading/Callback.h
+++ b/src/server/shared/Threading/Callback.h
@@ -110,8 +110,8 @@ class QueryCallback
ParamType _param;
uint8 _stage;
- QueryCallback(QueryCallback const& right) DELETE_MEMBER;
- QueryCallback& operator=(QueryCallback const& right) DELETE_MEMBER;
+ QueryCallback(QueryCallback const& right) = delete;
+ QueryCallback& operator=(QueryCallback const& right) = delete;
};
template <typename Result, typename ParamType1, typename ParamType2, bool chain = false>
@@ -205,8 +205,8 @@ class QueryCallback_2
ParamType2 _param_2;
uint8 _stage;
- QueryCallback_2(QueryCallback_2 const& right) DELETE_MEMBER;
- QueryCallback_2& operator=(QueryCallback_2 const& right) DELETE_MEMBER;
+ QueryCallback_2(QueryCallback_2 const& right) = delete;
+ QueryCallback_2& operator=(QueryCallback_2 const& right) = delete;
};
#endif \ No newline at end of file