diff options
| author | Intel <chemicstry@gmail.com> | 2014-12-07 23:20:52 +0200 |
|---|---|---|
| committer | Intel <chemicstry@gmail.com> | 2014-12-07 23:20:52 +0200 |
| commit | 4825832c85f5ae824c0e099ed5defa516333e00f (patch) | |
| tree | 9c6b12a3646b632c5761a7cfb8cf57fef973f65e /src/server/ipc/ZmqWorker.cpp | |
| parent | 4b8493d4b2e492cd4a0cda9719cdad187ec0673b (diff) | |
| parent | 88ca8b95e0e1a31bd561e741da96b582d16c984a (diff) | |
Merge branch '6.x' into Spells
Conflicts:
src/server/game/DataStores/DBCStores.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Server/Protocol/Opcodes.cpp
src/server/scripts/Spells/spell_druid.cpp
Diffstat (limited to 'src/server/ipc/ZmqWorker.cpp')
| -rw-r--r-- | src/server/ipc/ZmqWorker.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/server/ipc/ZmqWorker.cpp b/src/server/ipc/ZmqWorker.cpp index f205ea831b5..a3db41efe18 100644 --- a/src/server/ipc/ZmqWorker.cpp +++ b/src/server/ipc/ZmqWorker.cpp @@ -18,8 +18,8 @@ #include "ZmqWorker.h" #include "ZmqContext.h" -ZmqWorker::ZmqWorker(std::string task_uri, std::string res_uri) : - _taskUri(task_uri), _resultsUri(res_uri) +ZmqWorker::ZmqWorker(std::string const& taskUri, std::string const& resUri) : + _taskUri(taskUri), _resultsUri(resUri) { } @@ -27,7 +27,6 @@ ZmqWorker::~ZmqWorker() { delete _taskQueue; delete _results; - delete _inproc; } void ZmqWorker::HandleOpen() |