diff options
| author | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-04-27 21:42:58 +0200 |
|---|---|---|
| committer | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-04-27 21:42:58 +0200 |
| commit | d4f3105d9a879f27baad6e43b8b3cb6fe2f0ef50 (patch) | |
| tree | 474ec7369f0d367d7780f73901d38d1daec4d2eb /src/net | |
| parent | 2c14cd30ecbacbd5a808cb2641d40f6d568ec294 (diff) | |
| download | manaserv-d4f3105d9a879f27baad6e43b8b3cb6fe2f0ef50.tar.gz manaserv-d4f3105d9a879f27baad6e43b8b3cb6fe2f0ef50.tar.bz2 manaserv-d4f3105d9a879f27baad6e43b8b3cb6fe2f0ef50.tar.xz manaserv-d4f3105d9a879f27baad6e43b8b3cb6fe2f0ef50.zip | |
Use nullptr instead of NULL everywhere
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/connection.cpp | 4 | ||||
| -rw-r--r-- | src/net/connectionhandler.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/net/connection.cpp b/src/net/connection.cpp index 88c59f02..c54c0dbb 100644 --- a/src/net/connection.cpp +++ b/src/net/connection.cpp @@ -43,13 +43,13 @@ bool Connection::start(const std::string &address, int port) enetAddress.port = port; #if defined(ENET_VERSION) && ENET_VERSION >= ENET_CUTOFF - mLocal = enet_host_create(NULL /* create a client host */, + mLocal = enet_host_create(nullptr /* create a client host */, 1 /* allow one outgoing connection */, 0 /* unlimited channel count */, 0 /* assume any amount of incoming bandwidth */, 0 /* assume any amount of outgoing bandwidth */); #else - mLocal = enet_host_create(NULL /* create a client host */, + mLocal = enet_host_create(nullptr /* create a client host */, 1 /* allow one outgoing connection */, 0 /* assume any amount of incoming bandwidth */, 0 /* assume any amount of outgoing bandwidth */); diff --git a/src/net/connectionhandler.cpp b/src/net/connectionhandler.cpp index d116aa93..f1bcf5ff 100644 --- a/src/net/connectionhandler.cpp +++ b/src/net/connectionhandler.cpp @@ -145,7 +145,7 @@ void ConnectionHandler::process(enet_uint32 timeout) // Reset the peer's client information. computerDisconnected(comp); clients.erase(std::find(clients.begin(), clients.end(), comp)); - event.peer->data = NULL; + event.peer->data = nullptr; } break; default: break; |