summaryrefslogtreecommitdiff
path: root/test/UnitTimeout.cpp
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2016-12-22 16:04:07 +0200
committerTor Lillqvist <tml@collabora.com>2016-12-22 14:23:42 +0000
commit4ed820d3d55715f4699a2315ccd5ffd7222941cd (patch)
treec37dc42dc6e26bfdc17eb93248d72792bb0a7a7c /test/UnitTimeout.cpp
parent3d5b9dd573b2e8bfd1debd8704092fbbd861f60b (diff)
add a configure option for using clang compiler plugins
and apply the nullptr plugin. Lots of hacking in my LO tree required to make this work, will probably end up needing to add an extra parameter to the LO side. Change-Id: I02ae1dcdece9d9ddf05f7757f6696e3a5d7d1f14 Reviewed-on: https://gerrit.libreoffice.org/32339 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'test/UnitTimeout.cpp')
-rw-r--r--test/UnitTimeout.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/UnitTimeout.cpp b/test/UnitTimeout.cpp
index 4cf3ed9a3..a5478b55f 100644
--- a/test/UnitTimeout.cpp
+++ b/test/UnitTimeout.cpp
@@ -53,11 +53,11 @@ public:
bool madeWSD = init(UnitType::Wsd, std::string());
assert(madeWSD);
delete UnitBase::Global;
- UnitBase::Global = NULL;
+ UnitBase::Global = nullptr;
bool madeKit = init(UnitType::Kit, std::string());
assert(madeKit);
delete UnitBase::Global;
- UnitBase::Global = NULL;
+ UnitBase::Global = nullptr;
}
};