From 59fe9674765aeee28f2de846b5bb7ebbe499ba4d Mon Sep 17 00:00:00 2001 From: Stephen Swaney Date: Wed, 12 Sep 2007 01:56:50 +0000 Subject: more gcc 4.1.x warning cleanup: applied MT_QueryAssert_patch.diff part of patch [#6994] Fixing warnings: conversion from string constant to char * Submitted by Renato Perini (mjordan). Thanks, Renato! --- intern/moto/include/MT_assert.h | 2 +- intern/moto/intern/MT_Assert.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/intern/moto/include/MT_assert.h b/intern/moto/include/MT_assert.h index c20f5699ea3..54aea403cda 100644 --- a/intern/moto/include/MT_assert.h +++ b/intern/moto/include/MT_assert.h @@ -48,7 +48,7 @@ // file, line, predicate form the message to ask, *do_assert should be set // to 0 to ignore. // returns 1 to break, false to ignore -MT_CDECL int MT_QueryAssert(char *file, int line, char *predicate, int *do_assert); +MT_CDECL int MT_QueryAssert(const char *file, int line, const char *predicate, int *do_assert); #ifdef NDEBUG diff --git a/intern/moto/intern/MT_Assert.cpp b/intern/moto/intern/MT_Assert.cpp index 999e3da5842..c16c43f2045 100644 --- a/intern/moto/intern/MT_Assert.cpp +++ b/intern/moto/intern/MT_Assert.cpp @@ -45,7 +45,7 @@ // Query the user if they want to break/abort the program, ignore the assert, or ignore all future // occurance of the assert. -int MT_QueryAssert(char *file, int line, char *predicate, int *do_assert) +int MT_QueryAssert(const char *file, int line, const char *predicate, int *do_assert) { #ifdef _WIN32 if (*do_assert) -- cgit v1.2.3