q-lang-cvs

[Albert G. <ag...@us...>]

Update of /cvsroot/q-lang/q-faust/src
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4523/src

Modified Files:
	faust.i 
Log Message:
fix 'deprecated conversion from string constant' warnings (gcc 4.2.1)

Index: faust.i
===================================================================
RCS file: /cvsroot/q-lang/q-faust/src/faust.i,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** faust.i	3 Jun 2006 08:59:26 -0000	1.17
--- faust.i	12 Mar 2008 10:51:34 -0000	1.18
***************
*** 216,220 ****
  struct ui_elem_t {
    ui_elem_type_t type;
!   char *label;
    float *zone;
    void *ref;
--- 216,220 ----
  struct ui_elem_t {
    ui_elem_type_t type;
!   const char *label;
    float *zone;
    void *ref;
***************
*** 775,779 ****
  struct stack_elem_t {
    int type;
!   char *label;
    int n;
    expr *xv;
--- 775,779 ----
  struct stack_elem_t {
    int type;
!   const char *label;
    int n;
    expr *xv;
***************
*** 789,793 ****
  }
  
! static int push(int type, char *label, int n, expr *xv)
  {
    if (stacksz+1 >= astacksz) {
--- 789,793 ----
  }
  
! static int push(int type, const char *label, int n, expr *xv)
  {
    if (stacksz+1 >= astacksz) {
***************
*** 806,810 ****
  }
  
! static int pop(int &type, char *&label, int &n, expr *&xv)
  {
    if (stacksz <= 0) return 0;
--- 806,810 ----
  }
  
! static int pop(int &type, const char *&label, int &n, expr *&xv)
  {
    if (stacksz <= 0) return 0;
***************
*** 828,832 ****
      expr x;
      int type;
!     char *label;
      expr *xv1 = (expr*)realloc(xv, (n+1)*sizeof(expr));
      if (xv1)
--- 828,832 ----
      expr x;
      int type;
!     const char *label;
      expr *xv1 = (expr*)realloc(xv, (n+1)*sizeof(expr));
      if (xv1)