← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/memory/multi_malloc.cc

  • Committer: Brian Aker
  • Date: 2010-10-29 01:13:40 UTC
  • mto: (1890.1.1 build)
  • mto: This revision was merged to the branch mainline in revision 1891.
  • Revision ID: brian@tangent.org-20101029011340-y9ixm180v9daypqr
Remove warnings for c++

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/memory/multi_malloc.cc
11
11
 
12
12
   You should have received a copy of the GNU General Public License
13
13
   along with this program; if not, write to the Free Software
14
 
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
14
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
15
15
 
16
16
#include "config.h"
17
17
 
61
61
  }
62
62
  va_end(args);
63
63
 
 
64
#ifdef HAVE_VALGRIND
 
65
  if (!(start= calloc(0, tot_length)))
 
66
    return(0);
 
67
#else
64
68
  if (!(start= malloc(tot_length)))
65
69
    return(0);
66
70
  if (zerofill)
67
71
    memset(start, 0, tot_length);
 
72
#endif
68
73
 
69
74
  va_start(args, zerofill);
70
75
  res= static_cast<char *>(start);