Mercurial > hg > octave-lyh

comparison src/mex.cc @ 10411:479cc8a0a846

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use gnulib namespace
author John W. Eaton <jwe@octave.org>
date Mon, 15 Mar 2010 15:57:23 -0400
parents 57a59eae83cc
children 12d25a1d84bf
comparison
equal deleted inserted replaced
10410:b3ec24dc305a 10411:479cc8a0a846
2105 } 2105 }
2106 2106
2107 // Allocate memory. 2107 // Allocate memory.
2108 void *malloc_unmarked (size_t n) 2108 void *malloc_unmarked (size_t n)
2109 { 2109 {
2110 void *ptr = ::malloc (n); 2110 void *ptr = gnulib::malloc (n);
2111 2111
2112 if (! ptr) 2112 if (! ptr)
2113 { 2113 {
2114 // FIXME -- could use "octave_new_handler();" instead 2114 // FIXME -- could use "octave_new_handler();" instead
2115 2115
2161 { 2161 {
2162 void *v; 2162 void *v;
2163 2163
2164 if (ptr) 2164 if (ptr)
2165 { 2165 {
2166 v = ::realloc (ptr, n); 2166 v = gnulib::realloc (ptr, n);
2167 2167
2168 std::set<void *>::iterator p = memlist.find (ptr); 2168 std::set<void *>::iterator p = memlist.find (ptr);
2169 2169
2170 if (v && p != memlist.end ()) 2170 if (v && p != memlist.end ())
2171 { 2171 {
2374 mex *mex_context = 0; 2374 mex *mex_context = 0;
2375 2375
2376 void * 2376 void *
2377 mxArray::malloc (size_t n) 2377 mxArray::malloc (size_t n)
2378 { 2378 {
2379 return mex_context ? mex_context->malloc_unmarked (n) : ::malloc (n); 2379 return mex_context ? mex_context->malloc_unmarked (n) : gnulib::malloc (n);
2380 } 2380 }
2381 2381
2382 void * 2382 void *
2383 mxArray::calloc (size_t n, size_t t) 2383 mxArray::calloc (size_t n, size_t t)
2384 { 2384 {
2476 } 2476 }
2477 2477
2478 void * 2478 void *
2479 mxMalloc (size_t n) 2479 mxMalloc (size_t n)
2480 { 2480 {
2481 return mex_context ? mex_context->malloc (n) : malloc (n); 2481 return mex_context ? mex_context->malloc (n) : gnulib::malloc (n);
2482 } 2482 }
2483 2483
2484 void * 2484 void *
2485 mxRealloc (void *ptr, size_t size) 2485 mxRealloc (void *ptr, size_t size)
2486 { 2486 {
2487 return mex_context ? mex_context->realloc (ptr, size) : realloc (ptr, size); 2487 return mex_context ? mex_context->realloc (ptr, size) : gnulib::realloc (ptr, size);
2488 } 2488 }
2489 2489
2490 void 2490 void
2491 mxFree (void *ptr) 2491 mxFree (void *ptr)
2492 { 2492 {