summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-04-01 12:36:16 (GMT)
committerTobias Markmann <tm@ayena.de>2016-04-01 15:56:34 (GMT)
commiteddd92ed76ae68cb1e202602fd3ebd11b69191a2 (patch)
tree8d396e5801d77a2f0ee4ab8e4c5093d8cf8118e6 /Slimber/Server.cpp
parenta79db8d446e152b715f435550c2a6e10a36ee532 (diff)
downloadswift-eddd92ed76ae68cb1e202602fd3ebd11b69191a2.zip
swift-eddd92ed76ae68cb1e202602fd3ebd11b69191a2.tar.bz2
Modernize code to use C++11 nullptr using clang-tidy
Run 'clang-tidy -fix -checks=modernize-use-nullptr' on all source code files on OS X. This does not modernize platform specific code on Linux and Windows Test-Information: Code builds and unit tests pass on OS X 10.11.4. Change-Id: Ic43ffeb1b76c1a933a55af03db3c54977f5f60dd
Diffstat (limited to 'Slimber/Server.cpp')
-rw-r--r--Slimber/Server.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Slimber/Server.cpp b/Slimber/Server.cpp
index c69c75d..d1afc23 100644
--- a/Slimber/Server.cpp
+++ b/Slimber/Server.cpp
@@ -51,7 +51,7 @@ Server::Server(
linkLocalServiceBrowser(linkLocalServiceBrowser),
vCardCollection(vCardCollection),
eventLoop(eventLoop),
- presenceManager(NULL),
+ presenceManager(nullptr),
stopping(false) {
linkLocalServiceBrowser->onServiceRegistered.connect(
boost::bind(&Server::handleServiceRegistered, this, _1));
@@ -105,7 +105,7 @@ void Server::stop(boost::optional<ServerError> e) {
stopping = true;
delete presenceManager;
- presenceManager = NULL;
+ presenceManager = nullptr;
if (serverFromClientSession) {
serverFromClientSession->finishSession();