User: rhaas Date: 2012/03/19 06:26 PM

Modified: /branches/ET_2011_10/ /branches/ET_2011_10/src/ set_pointers.h

Log: merge r6 of trunk to compile with gcc 4.6

Directory Changes:

Directory: /branches/ET_2011_10/ ================================

Property changes on: branches/ET_2011_10 ___________________________________________________________________ Directory: /svn:mergeinfo/ ==========================

+ /trunk:6

File Changes:

Directory: /branches/ET_2011_10/src/ ====================================

File [modified]: set_pointers.h Delta lines: +4 -4 =================================================================== --- branches/ET_2011_10/src/set_pointers.h 2011-10-27 14:37:05 UTC (rev 6) +++ branches/ET_2011_10/src/set_pointers.h 2012-03-19 23:26:25 UTC (rev 7) @@ -1,9 +1,9 @@

// define pointer array for past timelevels! - vector<CCTK_REAL*> uBondiP(max_timelevels, NULL); - vector<CCTK_COMPLEX*> Psi4P(max_timelevels, NULL); - vector<CCTK_COMPLEX*> NewsP(max_timelevels, NULL); - vector<CCTK_COMPLEX*> NewsBP(max_timelevels, NULL); + vector<CCTK_REAL*> uBondiP(max_timelevels, (CCTK_REAL*)NULL); + vector<CCTK_COMPLEX*> Psi4P(max_timelevels, (CCTK_COMPLEX*)NULL); + vector<CCTK_COMPLEX*> NewsP(max_timelevels, (CCTK_COMPLEX*)NULL); + vector<CCTK_COMPLEX*> NewsBP(max_timelevels, (CCTK_COMPLEX*)NULL);

// Get current timelevel... // We assume here that the two vars uBondi[0] amd uBondi[1] are right next to each