Merge branch 'master' into lpc2012

1 files changed, 3 insertions, 3 deletions

diff --git a/src/account-server/main-account.cpp b/src/account-server/main-account.cpp
index db69fe69..ee5fcaf3 100644
--- a/src/account-server/main-account.cpp
+++ b/src/account-server/main-account.cpp
@@ -148,7 +148,7 @@ static void initialize()
     utils::processor::init();
 
     // Seed the random number generator
-    std::srand( time(NULL) );
+    std::srand( time(nullptr) );
 }
 
 
@@ -258,7 +258,7 @@ static void parseOptions(int argc, char *argv[], CommandLineOptions &options)
 
     while (optind < argc)
     {
-        int result = getopt_long(argc, argv, optString, longOptions, NULL);
+        int result = getopt_long(argc, argv, optString, longOptions, nullptr);
 
         if (result == -1)
             break;
@@ -371,7 +371,7 @@ int main(int argc, char *argv[])
 
     // Write startup time to database as system world state variable
     std::stringstream timestamp;
-    timestamp << time(NULL);
+    timestamp << time(nullptr);
     storage->setWorldStateVar("accountserver_startup", timestamp.str(),
                               Storage::SystemMap);