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/ZmqMux.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/ZmqMux.cpp')
| -rw-r--r-- | src/server/ipc/ZmqMux.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/server/ipc/ZmqMux.cpp b/src/server/ipc/ZmqMux.cpp index 2b62eaaf1eb..0f87106a948 100644 --- a/src/server/ipc/ZmqMux.cpp +++ b/src/server/ipc/ZmqMux.cpp @@ -18,15 +18,15 @@ #include "ZmqMux.h" #include "ZmqContext.h" -ZmqMux::ZmqMux(std::string from_uri, std::string to_uri): - _fromAddress(from_uri) +ZmqMux::ZmqMux(std::string const& fromUri, std::string const& toUri): + _fromAddress(fromUri) { - printf("Opening muxer thread from %s to %s\n", from_uri.c_str(), to_uri.c_str()); + printf("Opening muxer thread from %s to %s\n", fromUri.c_str(), toUri.c_str()); _from = sIpcContext->CreateNewSocket(zmqpp::socket_type::pull); _to = sIpcContext->CreateNewSocket(zmqpp::socket_type::push); - _from->bind(from_uri); - _to->connect(to_uri); + _from->bind(fromUri); + _to->connect(toUri); } ZmqMux::~ZmqMux() |