summaryrefslogtreecommitdiffstats
path: root/fnet/src/tests/frt/rpc/session.cpp
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2017-01-13 16:53:02 +0100
committerHenning Baldersheim <balder@yahoo-inc.com>2017-01-13 16:53:02 +0100
commitb4bd9c1287e08d79b6eca81fa0ff0f84cb422089 (patch)
treee071bae305c302bd9726cff38d9e072239dc2dd6 /fnet/src/tests/frt/rpc/session.cpp
parent71ecce0d5fc572a6e71dc9b554c57df9f6ea7827 (diff)
NULL -> nullptr
Diffstat (limited to 'fnet/src/tests/frt/rpc/session.cpp')
-rw-r--r--fnet/src/tests/frt/rpc/session.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/fnet/src/tests/frt/rpc/session.cpp b/fnet/src/tests/frt/rpc/session.cpp
index c39fe8cba05..a7b889dc71b 100644
--- a/fnet/src/tests/frt/rpc/session.cpp
+++ b/fnet/src/tests/frt/rpc/session.cpp
@@ -1,4 +1,5 @@
// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
#include <vespa/vespalib/testkit/test_kit.h>
#include <vespa/fnet/frt/frt.h>
@@ -6,7 +7,7 @@
class Session
{
private:
- static FNET_Mutex _lock;
+ static FastOS_Mutex _lock;
static int _cnt;
int _val;
@@ -30,7 +31,7 @@ public:
static int GetCnt() { return _cnt; }
};
-FNET_Mutex Session::_lock;
+FastOS_Mutex Session::_lock;
int Session::_cnt(0);
@@ -50,7 +51,7 @@ struct RPC : public FRT_Invokable
{
Session *session =
(Session *)req->GetConnection()->GetContext()._value.VOIDP;
- bogusFini |= (session == NULL);
+ bogusFini |= (session == nullptr);
delete session;
}