File tree Expand file tree Collapse file tree 1 file changed +5
-8
lines changed Expand file tree Collapse file tree 1 file changed +5
-8
lines changed Original file line number Diff line number Diff line change 1
1
/* ****************************************************************************
2
2
3
3
Copyright (c) 2014, 2015, Oracle and/or its affiliates. All Rights Reserved.
4
+ Copyright (c) 2017, MariaDB Corporation.
4
5
5
6
This program is free software; you can redistribute it and/or modify it under
6
7
the terms of the GNU General Public License as published by the Free Software
@@ -389,25 +390,21 @@ class ut_allocator {
389
390
}
390
391
391
392
/* * Free a memory allocated by allocate() and trace the deallocation.
392
- @param[in,out] ptr pointer to memory to free
393
- @param[in] n_elements number of elements allocated (unused) */
394
- void
395
- deallocate (
396
- pointer ptr,
397
- size_type n_elements = 0 )
393
+ @param[in,out] ptr pointer to memory to free */
394
+ void deallocate (pointer ptr, size_type)
398
395
{
396
+ #ifdef UNIV_PFS_MEMORY
399
397
if (ptr == NULL ) {
400
398
return ;
401
399
}
402
400
403
- #ifdef UNIV_PFS_MEMORY
404
401
ut_new_pfx_t * pfx = reinterpret_cast <ut_new_pfx_t *>(ptr) - 1 ;
405
402
406
403
deallocate_trace (pfx);
407
404
408
405
free (pfx);
409
406
#else
410
- // free(ptr);
407
+ free (ptr);
411
408
#endif /* UNIV_PFS_MEMORY */
412
409
}
413
410
You can’t perform that action at this time.
0 commit comments