From 946ab3e8b71ad106c7e75fd78b96d70865b29d79 Mon Sep 17 00:00:00 2001 From: Vincent-Michael Date: Mon, 21 Jul 2014 18:13:48 +0200 Subject: Core: Kill again whitespace :( --- src/server/shared/Configuration/Config.cpp | 2 +- src/server/shared/Database/PreparedStatement.cpp | 2 +- src/server/shared/Logging/Log.cpp | 2 +- src/server/shared/Logging/Log.h | 2 +- src/server/shared/Threading/ProducerConsumerQueue.h | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/server/shared') diff --git a/src/server/shared/Configuration/Config.cpp b/src/server/shared/Configuration/Config.cpp index 5cd7ef52f82..ecebf30182e 100644 --- a/src/server/shared/Configuration/Config.cpp +++ b/src/server/shared/Configuration/Config.cpp @@ -103,6 +103,6 @@ std::list ConfigMgr::GetKeysByString(std::string const& name) for (const ptree::value_type& child : _config) if (child.first.compare(0, name.length(), name) == 0) keys.push_back(child.first); - + return keys; } diff --git a/src/server/shared/Database/PreparedStatement.cpp b/src/server/shared/Database/PreparedStatement.cpp index fb1bfa687d0..be5591667be 100644 --- a/src/server/shared/Database/PreparedStatement.cpp +++ b/src/server/shared/Database/PreparedStatement.cpp @@ -447,7 +447,7 @@ std::string MySQLPreparedStatement::getQueryString(std::string const& sqlPattern //- Execution PreparedStatementTask::PreparedStatementTask(PreparedStatement* stmt, bool async) : m_stmt(stmt) -{ +{ m_has_result = async; // If it's async, then there's a result if (async) m_result = new PreparedQueryResultPromise(); diff --git a/src/server/shared/Logging/Log.cpp b/src/server/shared/Logging/Log.cpp index 65cf930a634..a7b6b418cc4 100644 --- a/src/server/shared/Logging/Log.cpp +++ b/src/server/shared/Logging/Log.cpp @@ -278,7 +278,7 @@ void Log::write(LogMessage* msg) const auto logOperation = std::shared_ptr(new LogOperation(logger, msg)); _ioService->post(_strand->wrap([logOperation](){ logOperation->call(); })); - + } else { diff --git a/src/server/shared/Logging/Log.h b/src/server/shared/Logging/Log.h index 8ae8db5bf5f..78e7e012bbe 100644 --- a/src/server/shared/Logging/Log.h +++ b/src/server/shared/Logging/Log.h @@ -50,7 +50,7 @@ class Log instance._ioService = ioService; instance._strand = new boost::asio::strand(*ioService); } - + return &instance; } diff --git a/src/server/shared/Threading/ProducerConsumerQueue.h b/src/server/shared/Threading/ProducerConsumerQueue.h index 3fefd27ba6e..98a0188b6b5 100644 --- a/src/server/shared/Threading/ProducerConsumerQueue.h +++ b/src/server/shared/Threading/ProducerConsumerQueue.h @@ -76,7 +76,7 @@ public: { _condition.wait(lock); } - + if (_queue.empty()) return; @@ -106,6 +106,6 @@ public: } }; -#endif +#endif -- cgit v1.2.3 From eae97c7bc897e021a000111e6579183fe123a333 Mon Sep 17 00:00:00 2001 From: Sebastian Valle Herrera Date: Mon, 21 Jul 2014 13:01:11 -0500 Subject: Core/PreparedStatements: Fixed a Coverity warning --- src/server/shared/Database/PreparedStatement.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/server/shared') diff --git a/src/server/shared/Database/PreparedStatement.cpp b/src/server/shared/Database/PreparedStatement.cpp index be5591667be..23c50ac2ef8 100644 --- a/src/server/shared/Database/PreparedStatement.cpp +++ b/src/server/shared/Database/PreparedStatement.cpp @@ -446,7 +446,7 @@ std::string MySQLPreparedStatement::getQueryString(std::string const& sqlPattern //- Execution PreparedStatementTask::PreparedStatementTask(PreparedStatement* stmt, bool async) : -m_stmt(stmt) +m_stmt(stmt), m_result(nullptr) { m_has_result = async; // If it's async, then there's a result if (async) -- cgit v1.2.3 From 5b0898b33cd6e928d51df003d1ab2b781ee92fbd Mon Sep 17 00:00:00 2001 From: leak Date: Mon, 21 Jul 2014 20:12:20 +0200 Subject: Core/DatabaseWorkerPool: Delete PCQ in dtor rather than in Close() and cancel queue properly before doing so --- src/server/shared/Database/DatabaseWorkerPool.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/server/shared') diff --git a/src/server/shared/Database/DatabaseWorkerPool.h b/src/server/shared/Database/DatabaseWorkerPool.h index f0b540022da..a1ee6407fea 100644 --- a/src/server/shared/Database/DatabaseWorkerPool.h +++ b/src/server/shared/Database/DatabaseWorkerPool.h @@ -59,6 +59,11 @@ class DatabaseWorkerPool ~DatabaseWorkerPool() { + _queue->Cancel(); + + delete _queue; + + delete _connectionInfo; } bool Open(const std::string& infoString, uint8 async_threads, uint8 synch_threads) @@ -122,12 +127,7 @@ class DatabaseWorkerPool for (uint8 i = 0; i < _connectionCount[IDX_SYNCH]; ++i) _connections[IDX_SYNCH][i]->Close(); - delete _queue; - TC_LOG_INFO("sql.driver", "All connections on DatabasePool '%s' closed.", GetDatabaseName()); - - delete _connectionInfo; - _connectionInfo = NULL; } /** -- cgit v1.2.3 From 44c0d66d63f58a022045efbb6cff6e1278f6a8cb Mon Sep 17 00:00:00 2001 From: DDuarte Date: Tue, 22 Jul 2014 13:12:03 +0100 Subject: Core/Misc: Remove a define that is no longer needed since ACE was removed --- src/server/game/Movement/Spline/MovementTypedefs.h | 2 -- src/server/shared/Utilities/ServiceWin32.cpp | 5 ----- src/tools/mmaps_generator/MapBuilder.h | 2 -- 3 files changed, 9 deletions(-) (limited to 'src/server/shared') diff --git a/src/server/game/Movement/Spline/MovementTypedefs.h b/src/server/game/Movement/Spline/MovementTypedefs.h index 22850036b61..635c43757be 100644 --- a/src/server/game/Movement/Spline/MovementTypedefs.h +++ b/src/server/game/Movement/Spline/MovementTypedefs.h @@ -23,14 +23,12 @@ namespace G3D { - class Vector2; class Vector3; class Vector4; } namespace Movement { - using G3D::Vector2; using G3D::Vector3; using G3D::Vector4; diff --git a/src/server/shared/Utilities/ServiceWin32.cpp b/src/server/shared/Utilities/ServiceWin32.cpp index f4a0339d9e6..ecf403423f7 100644 --- a/src/server/shared/Utilities/ServiceWin32.cpp +++ b/src/server/shared/Utilities/ServiceWin32.cpp @@ -24,11 +24,6 @@ #include #include -// stupid ACE define -#ifdef main -#undef main -#endif //main - #if !defined(WINADVAPI) #if !defined(_ADVAPI32_) #define WINADVAPI DECLSPEC_IMPORT diff --git a/src/tools/mmaps_generator/MapBuilder.h b/src/tools/mmaps_generator/MapBuilder.h index 944d03968b5..1d688ccfa77 100644 --- a/src/tools/mmaps_generator/MapBuilder.h +++ b/src/tools/mmaps_generator/MapBuilder.h @@ -35,8 +35,6 @@ using namespace VMAP; -// G3D namespace typedefs conflicts with ACE typedefs - namespace MMAP { struct MapTiles -- cgit v1.2.3