Manta Interactive Ray Tracer Development Mailing List

Text archives Help


[MANTA] r1324 - trunk/Core/Util


Chronological Thread 
  • From: boulos@sci.utah.edu
  • To: manta@sci.utah.edu
  • Subject: [MANTA] r1324 - trunk/Core/Util
  • Date: Fri, 6 Apr 2007 13:03:59 -0600 (MDT)

Author: boulos
Date: Fri Apr  6 13:03:58 2007
New Revision: 1324

Modified:
   trunk/Core/Util/AlignedAllocator.cc
Log:
Committing memalign fix for mac (malloc on macs
are always at least 16 byte aligned)


Modified: trunk/Core/Util/AlignedAllocator.cc
==============================================================================
--- trunk/Core/Util/AlignedAllocator.cc (original)
+++ trunk/Core/Util/AlignedAllocator.cc Fri Apr  6 13:03:58 2007
@@ -35,7 +35,11 @@
 void* Manta::allocateAligned(size_t size, size_t alignment)
 {
   void* memptr;
+#ifdef __APPLE__
+  int return_code = ( ((memptr = malloc(size)) == NULL) ? ENOMEM : 0);
+#else
   int return_code = posix_memalign(&memptr, alignment, size);
+#endif
   switch (return_code) {
   case 0:
     return memptr;




  • [MANTA] r1324 - trunk/Core/Util, boulos, 04/06/2007

Archive powered by MHonArc 2.6.16.

Top of page