git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7644 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2012-02-01 16:07:44 +00:00
parent 7e11d0e7ba
commit 2c42373bc8
28 changed files with 300 additions and 206 deletions
--- a/src/memory.cpp
+++ b/src/memory.cpp
@ -34,7 +34,8 @@ void *Memory::smalloc(bigint nbytes, const char *name)

 #if defined(LAMMPS_MEMALIGN)
  void *ptr;
-  posix_memalign(&ptr, LAMMPS_MEMALIGN, nbytes);
+  int retval = posix_memalign(&ptr, LAMMPS_MEMALIGN, nbytes);
+  if (retval) ptr = NULL;
 #else
  void *ptr = malloc(nbytes);
 #endif