Revision 692

branches/merge-trunk-davef/contrib/GNUmakefile (revision 692)
20 20
DISKDIR=../${DISK}/contrib
21 21
endif
22 22

  
23
all: disk statslib ecolib qfclib libcontribo.a libcontribs.a ad2csv
23
all: disk statslib ecolib qfclib libcontribo.a libcontribs.a
24 24

  
25 25
disk:
26 26
ifeq ($(CXX),g++.exe)
branches/merge-trunk-davef/scripts/g++/Makefile (revision 692)
161 161
	cd admb-re/$@;rm -f @.par @.std;admb -r $(DEBUG_OPTION) $(SAFE_OPTION) $@;$(PROG) ./$@
162 162

  
163 163
spatial:
164
	cd admb-re/$@;rm -f @.par @.std;admb -r $(DEBUG_OPTION) $(SAFE_OPTION) $@;$(PROG) ./$@
164
	-cd admb-re/$@;rm -f @.par @.std;admb -r $(DEBUG_OPTION) $(SAFE_OPTION) $@;$(PROG) ./$@
165 165

  
166 166
union:
167 167
	cd admb-re/$@;rm -f @.par @.std;admb -r $(DEBUG_OPTION) $(SAFE_OPTION) $@;$(PROG) ./$@
branches/merge-trunk-davef/src/tools99/string1.cpp (revision 692)
7 7
#include <fvar.hpp>
8 8
#include <string.h>
9 9
#include <stdlib.h>
10
#include <safe_mem.h>
11 10
#include "admb_messages.h"
12 11

  
13 12
adstring adstring::operator()(int i, int j)
......
62 61
  {
63 62
    int sz = t.size ();
64 63
    shape->size() = t.size();
65
    mem_free(++s);
64
    free(++s);
66 65
  #if (defined __ZTC__) || (defined __NDPX__)
67
    s =  (char*)mem_malloc(sz+1);
66
    s =  (char*)malloc(sz+1);
68 67
  #else
69
    s =  (unsigned char*)mem_malloc(sz+1);
68
    s =  (unsigned char*)malloc(sz+1);
70 69
  #endif
71 70
    s--;
72 71
    int size = t.size();
......
90 89
{
91 90
  int sz = strlen(t);
92 91
  shape->size() = strlen(t);
93
  mem_free(++s);
94
  s =  (unsigned char*)mem_malloc(sz+1);
92
  free(++s);
93
  s =  (unsigned char*)malloc(sz+1);
95 94
  strcpy((char*)(s),t);
96 95
  s--;
97 96
  adstring * tmp = (adstring *) this->next;
......
107 106
{
108 107
  if (next==this)
109 108
  {
110
    mem_free(shape);
111
    mem_free(++s);
109
    free(shape);
110
    shape=0;
112 111
  }
113 112
};
114 113
 
branches/merge-trunk-davef/src/linux.mak (revision 692)
37 37
endif
38 38

  
39 39
ifdef DEBUG
40
CXXFLAGS:=-c -g $(CXXFLAGS)
40
CXXFLAGS:=-c -g -fpermissive $(CXXFLAGS)
41 41
else
42
CXXFLAGS:=-c -O3 $(CXXFLAGS)
42
CXXFLAGS:=-c -O3 -fpermissive $(CXXFLAGS)
43 43
endif
44 44

  
45 45
dist:
......
117 117
	@rm -f nh99/lex.yy.c
118 118
	@rm -f df1b2-separable/lex.yy.c
119 119
	@rm -f nh99/tpl2cpp
120
	@rm -f nh99/tpl2cpp.c
120 121
	@rm -f df1b2-separable/tpl2rem
122
	@rm -f df1b2-separable/tpl2rem.c
123

  
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff