summaryrefslogtreecommitdiff
path: root/salhelper/qa
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-10 10:22:15 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-10 10:31:35 +0100
commitde63cac20fba1e7661687a4f1c1ce91182f4dfa0 (patch)
tree5350f357dbf174ccd167e2af3ae58a18698306d7 /salhelper/qa
parent26f05d59bc1c25b8a0d19be7f4738fd12e557001 (diff)
loplugin:nullptr (automatic rewrite)
Change-Id: If341fc7d18bb6f07d76dd259f5dd77b447c93566
Diffstat (limited to 'salhelper/qa')
-rw-r--r--salhelper/qa/test_api.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/salhelper/qa/test_api.cxx b/salhelper/qa/test_api.cxx
index 686e5cda4617..4a73b63d273b 100644
--- a/salhelper/qa/test_api.cxx
+++ b/salhelper/qa/test_api.cxx
@@ -128,7 +128,7 @@ void Test::testCondition() {
void Test::testConditionModifier() {
- salhelper::ConditionModifier * p = 0;
+ salhelper::ConditionModifier * p = nullptr;
CPPUNIT_ASSERT(typeid (*p) == typeid (salhelper::ConditionModifier));
CPPUNIT_ASSERT(typeid (p) == typeid (salhelper::ConditionModifier *));
CPPUNIT_ASSERT(
@@ -143,7 +143,7 @@ void Test::testConditionModifier() {
}
void Test::testConditionWaiter() {
- salhelper::ConditionWaiter * p = 0;
+ salhelper::ConditionWaiter * p = nullptr;
CPPUNIT_ASSERT(typeid (*p) == typeid (salhelper::ConditionWaiter));
CPPUNIT_ASSERT(typeid (p) == typeid (salhelper::ConditionWaiter *));
CPPUNIT_ASSERT(
@@ -177,7 +177,7 @@ void Test::testConditionWaiterTimedout() {
}
void Test::testORealDynamicLoader() {
- salhelper::ORealDynamicLoader * p = 0;
+ salhelper::ORealDynamicLoader * p = nullptr;
CPPUNIT_ASSERT(typeid (p) != typeid (salhelper::ORealDynamicLoader));
CPPUNIT_ASSERT(typeid (p) == typeid (salhelper::ORealDynamicLoader *));
CPPUNIT_ASSERT(
@@ -222,14 +222,14 @@ void Test::testSimpleReferenceObject() {
void Test::testDerivedCondition() {
osl::Mutex mutex;
std::unique_ptr< salhelper::Condition > p(new DerivedCondition(mutex));
- CPPUNIT_ASSERT(dynamic_cast< DerivedCondition * >(p.get()) != 0);
+ CPPUNIT_ASSERT(dynamic_cast< DerivedCondition * >(p.get()) != nullptr);
}
void Test::testDerivedConditionWaiterTimedout() {
std::unique_ptr< salhelper::ConditionWaiter::timedout > p(
new DerivedConditionWaiterTimedout);
CPPUNIT_ASSERT(
- dynamic_cast< DerivedConditionWaiterTimedout * >(p.get()) != 0);
+ dynamic_cast< DerivedConditionWaiterTimedout * >(p.get()) != nullptr);
try {
throw DerivedConditionWaiterTimedout();
} catch (salhelper::ConditionWaiter::timedout &) {
@@ -241,7 +241,7 @@ void Test::testDerivedConditionWaiterTimedout() {
void Test::testDerivedSimpleReferenceObject() {
salhelper::SimpleReferenceObject * p = new DerivedSimpleReferenceObject;
try {
- CPPUNIT_ASSERT(dynamic_cast< DerivedSimpleReferenceObject * >(p) != 0);
+ CPPUNIT_ASSERT(dynamic_cast< DerivedSimpleReferenceObject * >(p) != nullptr);
} catch (...) {
delete static_cast< DerivedSimpleReferenceObject * >(p);
throw;