Revision 1223

branches/threaded2/src/linux.mak (revision 1223)
38 38
endif
39 39

  
40 40
ifdef DEBUG
41
CXXFLAGS:=-D__MINGW__ -c -g $(CXXFLAGS) -w -fpermissive -pthread -DUSE_PTHREADS
41
#CXXFLAGS:=-D__MINGW__ -c -g $(CXXFLAGS) -w -fpermissive -pthread -DUSE_PTHREADS
42
CXXFLAGS:=-D__MINGW__ -c -g $(CXXFLAGS) -w -pthread -DUSE_PTHREADS
42 43
else
43
CXXFLAGS:=-D__MINGW__ -c $(CXXFLAGS) -ggdb -w -fpermissive -pthread  -DUSE_PTHREADS
44
#CXXFLAGS:=-D__MINGW__ -c $(CXXFLAGS) -ggdb -w -fpermissive -pthread  -DUSE_PTHREADS
45
CXXFLAGS:=-D__MINGW__ -c $(CXXFLAGS) -ggdb -w -pthread  -DUSE_PTHREADS
44 46
endif
45 47

  
46 48
dist:
branches/threaded2/src/linad99/adthread.h (revision 1223)
21 21
 // 
22 22
 typedef char * pchar;
23 23
 typedef ofstream * pofstream;
24
 typedef void (*pthreadfun)(void*);
24
 typedef void* (*pthreadfun)(void*);
25 25
 typedef pthreadfun * ppthreadfun;
26 26
 typedef pthread_mutex_t * ppthread_mutex_t;  
27 27
 typedef pthread_cond_t * ppthread_cond_t;
branches/threaded2/src/linad99/gradstrc.cpp (revision 1223)
415 415
   }
416 416
 */
417 417

  
418
   ARRAY_MEMBLOCK_BASE = temp_ptr;
418
   ARRAY_MEMBLOCK_BASE = (char*)temp_ptr;
419 419
  
420 420
   //cout << (void*) ARRAY_MEMBLOCK_BASE.ptr  << "   ";
421 421
   //cout << (int) ARRAY_MEMBLOCK_BASE.ptr  << endl;
branches/threaded2/src/linad99/sgradclc.cpp (revision 1223)
275 275
   }
276 276
   if (gradient_structure::save_var_file_flag==0)
277 277
   {
278
     ARRAY_MEMBLOCK_SAVE = temp_ptr;
278
     ARRAY_MEMBLOCK_SAVE = (char*)temp_ptr;
279 279
     #if defined(DOS386)
280 280
     //#if DOS386==1
281 281
       #ifndef USE_ASSEMBLER
branches/threaded2/src/linad99/dmat.cpp (revision 1223)
31 31
/**
32 32
 * Description not yet available.
33 33
 * \param
34
 */
34

  
35 35
 void dmatrix::allocate(int nrl,int nrh,int ncl,int nch,const dvector& x,
36 36
   int & off1)
37 37
 {
......
60 60
     //m[i].allocate(ncl,nch);
61 61
   }
62 62
 }
63
 */
64
/*
63 65
 void dmatrix::allocate(int nrl,int nrh,int ncl,const ivector& ind1,const dvector& x,
64 66
   int & off1)
65 67
 {
......
88 90
     //m[i].allocate(ncl,nch);
89 91
   }
90 92
 }
93
  */
91 94
 void dmatrix::allocate(int nrl,int nrh,int ncl,int nch)
92 95
 {
93 96
   if (nrh<nrl)
branches/threaded2/src/linad99/cmpdif8.cpp (revision 1223)
49 49
 */
50 50
void prevariable::save_prevariable_position(void) const
51 51
{
52
  double_and_int * tmp=get_v();
52
  //double_and_int * tmp=get_v();
53
  prevariable t = *this;
54
  double_and_int * tmp=t.get_v();
55
  
53 56
  int wsize=sizeof(double_and_int*);
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff