summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swiften/Base/ByteArray.h')
-rw-r--r--Swiften/Base/ByteArray.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/Swiften/Base/ByteArray.h b/Swiften/Base/ByteArray.h
index c0babdf..b567b5a 100644
--- a/Swiften/Base/ByteArray.h
+++ b/Swiften/Base/ByteArray.h
@@ -33,12 +33,12 @@ namespace Swift {
template<typename T, typename A>
static const T* vecptr(const std::vector<T, A>& v) {
- return v.empty() ? NULL : &v[0];
+ return v.empty() ? nullptr : &v[0];
}
template<typename T, typename A>
static T* vecptr(std::vector<T, A>& v) {
- return v.empty() ? NULL : &v[0];
+ return v.empty() ? nullptr : &v[0];
}
SWIFTEN_API std::string byteArrayToString(const ByteArray& b);