From: Karl S. <ksc...@rs...> - 2001-03-22 18:07:45
|
> > Another problem is > > > > warning C4003: not enough actual parameters for macro > > 'ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL' > > > > which is caused by > > > > #define ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, retval) \ > > do { \ > > if (ctx->Driver.CurrentExecPrimitive != GL_POLYGON+1) { \ > > _mesa_error( ctx, GL_INVALID_OPERATION, "begin/end" ); \ > > return retval; \ > > } \ > > } while (0) > > > > #define ASSERT_OUTSIDE_BEGIN_END(ctx) \ > > ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx,) > > > > in mtypes.h. > > > > I think that the code is expanding to what we want, but is > just generating a > > warning. If we're sure that this is OK, then > > > > # pragma warning( disable : 4003 ) /* not enough actual > parameters for > > macro */ > > > > may be a good addition to glheader.h (under the MESA_MINWARN group) > > > The pragma might hide other, legitimate problems. > > I'd rather just see the macro changed: > > #define ASSERT_OUTSIDE_BEGIN_END(ctx) > do { \ > if (ctx->Driver.CurrentExecPrimitive != GL_POLYGON+1) { \ > _mesa_error( ctx, GL_INVALID_OPERATION, "begin/end" ); \ > return; \ > } \ > } while (0) > > -Brian > Right. Good point. There's another instance of the same sort of thing in dlist.h. |