Merge branch release-2016

[alexxy/gromacs.git] / src / gromacs / imd / imdsocket.cpp

diff --git a/src/gromacs/imd/imdsocket.cpp b/src/gromacs/imd/imdsocket.cpp
index b34e3e8975797f4ac9714cafb05c99effee1a365..afaa54dc9ccb94f8f00d3138f9768cd8eed0c422 100644 (file)
--- a/src/gromacs/imd/imdsocket.cpp
+++ b/src/gromacs/imd/imdsocket.cpp
@@ -106,7 +106,7 @@ static void print_IMD_error(const char *file, int line, char *msg)
 {
     fprintf(stderr, "%s Error in file %s on line %d.\n", IMDstr, file, line);
 
-    if (NULL != msg)
+    if (nullptr != msg)
     {
         fprintf(stderr, "%s\n", msg);
     }
@@ -115,7 +115,7 @@ static void print_IMD_error(const char *file, int line, char *msg)
 
 extern IMDSocket* imdsock_create()
 {
-    IMDSocket *sock = NULL;
+    IMDSocket *sock = nullptr;
 
 
 #ifdef GMX_IMD
@@ -126,7 +126,7 @@ extern IMDSocket* imdsock_create()
         print_IMD_error(ERR_ARGS);
         sfree(sock);
 
-        return NULL;
+        return nullptr;
     }
     else
 #endif
@@ -209,7 +209,7 @@ extern IMDSocket* imdsock_accept(IMDSocket *sock)
     {
         print_IMD_error(ERR_ARGS);
 
-        return NULL;
+        return nullptr;
     }
 }
 
@@ -277,7 +277,7 @@ extern void imdsock_shutdown(IMDSocket *sock)
 
 
     /* is the socket already NULL? */
-    if (sock == NULL)
+    if (sock == nullptr)
     {
         return;
     }
@@ -300,7 +300,7 @@ extern int imdsock_destroy(IMDSocket *sock)
     int ret = -1;
 
 
-    if (sock == NULL)
+    if (sock == nullptr)
     {
         return 1;
     }
@@ -350,7 +350,7 @@ extern int imdsock_tryread(IMDSocket *sock, int timeoutsec, int timeoutusec)
     do
     {
         /* check the set for read readiness. */
-        ret = select(sock->sockfd + 1, &readfds, NULL, NULL, tval);
+        ret = select(sock->sockfd + 1, &readfds, nullptr, nullptr, tval);
         /* redo on system interrupt */
     }
     while (ret < 0 && errno == EINTR);