Swiftdiff options
Diffstat (limited to 'Swiften/Base')
| -rw-r--r-- | Swiften/Base/BoostRandomGenerator.cpp | 2 | ||||
| -rw-r--r-- | Swiften/Base/ByteArray.h | 4 | ||||
| -rw-r--r-- | Swiften/Base/FileSize.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Swiften/Base/BoostRandomGenerator.cpp b/Swiften/Base/BoostRandomGenerator.cpp index 8db3ca6..d893d4d 100644 --- a/Swiften/Base/BoostRandomGenerator.cpp +++ b/Swiften/Base/BoostRandomGenerator.cpp @@ -16,7 +16,7 @@ namespace Swift { BoostRandomGenerator::BoostRandomGenerator() { // FIXME: Not a good seed - generator.seed(static_cast<unsigned int>(std::time(0))); + generator.seed(static_cast<unsigned int>(std::time(nullptr))); } int BoostRandomGenerator::generateRandomInteger(int maximum) { 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); diff --git a/Swiften/Base/FileSize.cpp b/Swiften/Base/FileSize.cpp index d9ab5ec..a335337 100644 --- a/Swiften/Base/FileSize.cpp +++ b/Swiften/Base/FileSize.cpp @@ -11,7 +11,7 @@ namespace Swift { std::string formatSize(const boost::uintmax_t bytes) { - static const char *siPrefix[] = {"k", "M", "G", "T", "P", "E", "Z", "Y", NULL}; + static const char *siPrefix[] = {"k", "M", "G", "T", "P", "E", "Z", "Y", nullptr}; int power = 0; double engBytes = bytes; while (engBytes >= 1000) { |