summaryrefslogtreecommitdiffstats
path: root/src/common/resourcemanager.h
diff options
context:
space:
mode:
authorErik Schilling <ablu.erikschilling@googlemail.com>2013-04-27 21:42:58 +0200
committerErik Schilling <ablu.erikschilling@googlemail.com>2013-04-27 21:42:58 +0200
commitd4f3105d9a879f27baad6e43b8b3cb6fe2f0ef50 (patch)
tree474ec7369f0d367d7780f73901d38d1daec4d2eb /src/common/resourcemanager.h
parent2c14cd30ecbacbd5a808cb2641d40f6d568ec294 (diff)
downloadmanaserv-d4f3105d9a879f27baad6e43b8b3cb6fe2f0ef50.tar.gz
manaserv-d4f3105d9a879f27baad6e43b8b3cb6fe2f0ef50.tar.xz
manaserv-d4f3105d9a879f27baad6e43b8b3cb6fe2f0ef50.zip
Use nullptr instead of NULL everywhere
Diffstat (limited to 'src/common/resourcemanager.h')
-rw-r--r--src/common/resourcemanager.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/resourcemanager.h b/src/common/resourcemanager.h
index 3d722a4..569428d 100644
--- a/src/common/resourcemanager.h
+++ b/src/common/resourcemanager.h
@@ -56,7 +56,7 @@ namespace ResourceManager
* @param fileSize The size of the file that was loaded.
*
* @return An allocated byte array containing the data that was loaded,
- * or <code>NULL</code> on failure.
+ * or <code>nullptr</code> on failure.
* @note The array contains an extra \0 character at position fileSize.
*/
char *loadFile(const std::string &fileName, int &fileSize);