Ignore:
Timestamp:
05/13/14 14:39:48 (10 years ago)
Author:
Malte Marquarding
Message:

Finally fix aall warning: deprecated conversion from string constant to 'char*'

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/external-alma/atnf/PKSIO/SDFITSwriter.cc

    r1757 r2940  
    230230
    231231  // SCAN (shared, real).
    232   fits_insert_col(cSDptr, ++ncol, "SCAN", "1I", &cStatus);
     232  fits_insert_col(cSDptr, ++ncol, (char *)"SCAN", (char *)"1I", &cStatus);
    233233
    234234  // CYCLE (additional, real).
    235   fits_insert_col(cSDptr, ++ncol, "CYCLE", "1J", &cStatus);
     235  fits_insert_col(cSDptr, ++ncol, (char *)"CYCLE", (char *)"1J", &cStatus);
    236236
    237237  // DATE-OBS (core, real).
    238   fits_insert_col(cSDptr, ++ncol, "DATE-OBS", "10A", &cStatus);
     238  fits_insert_col(cSDptr, ++ncol, (char *)"DATE-OBS", (char *)"10A", &cStatus);
    239239
    240240  // TIME (core, real).
    241   fits_insert_col(cSDptr, ++ncol, "TIME", "1D", &cStatus);
     241  fits_insert_col(cSDptr, ++ncol, (char *)"TIME", (char *)"1D", &cStatus);
    242242  sprintf(tunit, "TUNIT%d", ncol);
    243243  fits_write_key_str(cSDptr, tunit, "s", "units of field", &cStatus);
    244244
    245245  // EXPOSURE (core, real).
    246   fits_insert_col(cSDptr, ++ncol, "EXPOSURE", "1E", &cStatus);
     246  fits_insert_col(cSDptr, ++ncol, (char *)"EXPOSURE", (char *)"1E", &cStatus);
    247247  sprintf(tunit, "TUNIT%d", ncol);
    248248  fits_write_key_str(cSDptr, tunit, "s", "units of field", &cStatus);
    249249
    250250  // OBJECT (core, real).
    251   fits_insert_col(cSDptr, ++ncol, "OBJECT", "16A", &cStatus);
     251  fits_insert_col(cSDptr, ++ncol, (char *)"OBJECT", (char *)"16A", &cStatus);
    252252
    253253  // OBJ-RA (additional, real).
    254   fits_insert_col(cSDptr, ++ncol, "OBJ-RA", "1D", &cStatus);
     254  fits_insert_col(cSDptr, ++ncol, (char *)"OBJ-RA", (char *)"1D", &cStatus);
    255255  sprintf(tunit, "TUNIT%d", ncol);
    256256  fits_write_key_str(cSDptr, tunit, "deg", "units of field", &cStatus);
    257257
    258258  // OBJ-DEC (additional, real).
    259   fits_insert_col(cSDptr, ++ncol, "OBJ-DEC", "1D", &cStatus);
     259  fits_insert_col(cSDptr, ++ncol, (char *)"OBJ-DEC", (char *)"1D", &cStatus);
    260260  sprintf(tunit, "TUNIT%d", ncol);
    261261  fits_write_key_str(cSDptr, tunit, "deg", "units of field", &cStatus);
    262262
    263263  // RESTFRQ (additional, real).
    264   fits_insert_col(cSDptr, ++ncol, "RESTFRQ", "1D", &cStatus);
     264  fits_insert_col(cSDptr, ++ncol, (char *)"RESTFRQ",(char *) "1D", &cStatus);
    265265  sprintf(tunit, "TUNIT%d", ncol);
    266266  fits_write_key_str(cSDptr, tunit, "Hz", "units of field", &cStatus);
    267267
    268268  // OBSMODE (shared, real).
    269   fits_insert_col(cSDptr, ++ncol, "OBSMODE", "16A", &cStatus);
     269  fits_insert_col(cSDptr, ++ncol, (char *)"OBSMODE", (char *)"16A", &cStatus);
    270270
    271271  // BEAM (additional, real).
    272   fits_insert_col(cSDptr, ++ncol, "BEAM", "1I", &cStatus);
     272  fits_insert_col(cSDptr, ++ncol, (char *)"BEAM", (char *)"1I", &cStatus);
    273273
    274274  // IF (additional, real).
    275   fits_insert_col(cSDptr, ++ncol, "IF", "1I", &cStatus);
     275  fits_insert_col(cSDptr, ++ncol, (char *)"IF", (char *)"1I", &cStatus);
    276276
    277277  // FREQRES (core, real).
    278   fits_insert_col(cSDptr, ++ncol, "FREQRES", "1D", &cStatus);
     278  fits_insert_col(cSDptr, ++ncol, (char *)"FREQRES", (char *)"1D", &cStatus);
    279279  sprintf(tunit, "TUNIT%d", ncol);
    280280  fits_write_key_str(cSDptr, tunit, "Hz", "units of field", &cStatus);
    281281
    282282  // BANDWID (core, real).
    283   fits_insert_col(cSDptr, ++ncol, "BANDWID", "1D", &cStatus);
     283  fits_insert_col(cSDptr, ++ncol, (char *)"BANDWID", (char *)"1D", &cStatus);
    284284  sprintf(tunit, "TUNIT%d", ncol);
    285285  fits_write_key_str(cSDptr, tunit, "Hz", "units of field", &cStatus);
    … …  
    290290
    291291  // CRPIX1 (core, real).
    292   fits_insert_col(cSDptr, ++ncol, "CRPIX1", "1E", &cStatus);
     292  fits_insert_col(cSDptr, ++ncol, (char *)"CRPIX1", (char *)"1E", &cStatus);
    293293
    294294  // CRVAL1 (core, real).
    295   fits_insert_col(cSDptr, ++ncol, "CRVAL1", "1D", &cStatus);
     295  fits_insert_col(cSDptr, ++ncol, (char *)"CRVAL1", (char *)"1D", &cStatus);
    296296  sprintf(tunit, "TUNIT%d", ncol);
    297297  fits_write_key_str(cSDptr, tunit, "Hz", "units of field", &cStatus);
    298298
    299299  // CDELT1 (core, real).
    300   fits_insert_col(cSDptr, ++ncol, "CDELT1", "1D", &cStatus);
     300  fits_insert_col(cSDptr, ++ncol, (char *)"CDELT1", (char *)"1D", &cStatus);
    301301  sprintf(tunit, "TUNIT%d", ncol);
    302302  fits_write_key_str(cSDptr, tunit, "Hz", "units of field", &cStatus);
    … …  
    330330
    331331  // CRVAL3 (core, real).
    332   fits_insert_col(cSDptr, ++ncol, "CRVAL3", "1D", &cStatus);
     332  fits_insert_col(cSDptr, ++ncol, (char *)"CRVAL3", (char *)"1D", &cStatus);
    333333  sprintf(tunit, "TUNIT%d", ncol);
    334334  fits_write_key_str(cSDptr, tunit, "deg", "units of field", &cStatus);
    … …  
    347347
    348348  // CRVAL4 (core, real).
    349   fits_insert_col(cSDptr, ++ncol, "CRVAL4", "1D", &cStatus);
     349  fits_insert_col(cSDptr, ++ncol, (char *)"CRVAL4", (char *)"1D", &cStatus);
    350350  sprintf(tunit, "TUNIT%d", ncol);
    351351  fits_write_key_str(cSDptr, tunit, "deg", "units of field", &cStatus);
    … …  
    355355
    356356  // SCANRATE (additional, real).
    357   fits_insert_col(cSDptr, ++ncol, "SCANRATE", "2E", &cStatus);
     357  fits_insert_col(cSDptr, ++ncol, (char *)"SCANRATE", (char *)"2E", &cStatus);
    358358  sprintf(tunit, "TUNIT%d", ncol);
    359359  fits_write_key_str(cSDptr, tunit, "deg/s", "units of field", &cStatus);
    … …  
    377377  // TSYS (core, real).
    378378  sprintf(tform, "%dE", maxNPol);
    379   fits_insert_col(cSDptr, ++ncol, "TSYS", tform, &cStatus);
     379  fits_insert_col(cSDptr, ++ncol, (char *)"TSYS", tform, &cStatus);
    380380  sprintf(tunit, "TUNIT%d", ncol);
    381381  fits_write_key_str(cSDptr, tunit, bunit, "units of field", &cStatus);
    … …  
    383383  // CALFCTR (additional, real).
    384384  sprintf(tform, "%dE", maxNPol);
    385   fits_insert_col(cSDptr, ++ncol, "CALFCTR", tform, &cStatus);
     385  fits_insert_col(cSDptr, ++ncol, (char *)"CALFCTR", tform, &cStatus);
    386386
    387387  if (cHaveBase) {
    388388    // BASELIN (additional, real).
    389389    sprintf(tform, "%dE", 2*maxNPol);
    390     fits_insert_col(cSDptr, ++ncol, "BASELIN", tform, &cStatus);
     390    fits_insert_col(cSDptr, ++ncol, (char *)"BASELIN", tform, &cStatus);
    391391    long tdim[] = {2, maxNPol};
    392392    fits_write_tdim(cSDptr, ncol, 2, tdim, &cStatus);
    … …  
    394394    // BASESUB (additional, real).
    395395    sprintf(tform, "%dE", 24*maxNPol);
    396     fits_insert_col(cSDptr, ++ncol, "BASESUB", tform, &cStatus);
     396    fits_insert_col(cSDptr, ++ncol, (char *)"BASESUB", tform, &cStatus);
    397397    tdim[0] = 24;
    398398    fits_write_tdim(cSDptr, ncol, 2, tdim, &cStatus);
    … …  
    407407    strcpy(tform, "1PE");
    408408  }
    409   fits_insert_col(cSDptr, ++ncol, "DATA", tform, &cStatus);
     409  fits_insert_col(cSDptr, ++ncol, (char *)"DATA", tform, &cStatus);
    410410
    411411  if (cDoTDIM) {
    412412    // TDIMn varies with IF, write a TDIM column.
    413413    sprintf(ttype, "TDIM%d", ncol);
    414     fits_insert_col(cSDptr, ++ncol, ttype, "16A", &cStatus);
     414    fits_insert_col(cSDptr, ++ncol, ttype, (char *)"16A", &cStatus);
    415415  } else {
    416416    // TDIMn fixed for each IF, write a TDIM keyword.
    … …  
    430430    strcpy(tform, "1PB");
    431431  }
    432   fits_insert_col(cSDptr, ++ncol, "FLAGGED", tform, &cStatus);
     432  fits_insert_col(cSDptr, ++ncol, (char *)"FLAGGED", tform, &cStatus);
    433433
    434434  if (cDoTDIM) {
    435435    // TDIMn varies with IF, write a TDIM column.
    436436    sprintf(ttype, "TDIM%d", ncol);
    437     fits_insert_col(cSDptr, ++ncol, ttype, "16A", &cStatus);
     437    fits_insert_col(cSDptr, ++ncol, ttype, (char *)"16A", &cStatus);
    438438  } else {
    439439    // TDIMn fixed for each IF, write a TDIM keyword.
    … …  
    445445    // XCALFCTR (additional, real).
    446446    sprintf(tform, "%dE", 2);
    447     fits_insert_col(cSDptr, ++ncol, "XCALFCTR", tform, &cStatus);
     447    fits_insert_col(cSDptr, ++ncol, (char *)"XCALFCTR", tform, &cStatus);
    448448
    449449    // XPOLDATA (additional, real).
    … …  
    455455      strcpy(tform, "1PE");
    456456    }
    457     fits_insert_col(cSDptr, ++ncol, "XPOLDATA", tform, &cStatus);
     457    fits_insert_col(cSDptr, ++ncol, (char *)"XPOLDATA", tform, &cStatus);
    458458
    459459    if (cDoTDIM) {
    460460      // TDIMn varies with IF, write a TDIM column.
    461461      sprintf(ttype, "TDIM%d", ncol);
    462       fits_insert_col(cSDptr, ++ncol, ttype, "16A", &cStatus);
     462      fits_insert_col(cSDptr, ++ncol, ttype, (char *)"16A", &cStatus);
    463463    } else {
    464464      // TDIMn fixed for each IF, write a TDIM keyword.
    … …  
    474474    if (cIsMX) {
    475475      // REFBEAM (additional, real).
    476       fits_insert_col(cSDptr, ++ncol, "REFBEAM",  "1I", &cStatus);
     476      fits_insert_col(cSDptr, ++ncol, (char *)"REFBEAM",  (char *)"1I", &cStatus);
    477477    }
    478478
    479479    // TCAL (shared, real).
    480480    sprintf(tform, "%dE", min(maxNPol,2));
    481     fits_insert_col(cSDptr, ++ncol, "TCAL", tform, &cStatus);
     481    fits_insert_col(cSDptr, ++ncol, (char *)"TCAL", tform, &cStatus);
    482482    sprintf(tunit, "TUNIT%d", ncol);
    483483    fits_write_key_str(cSDptr, tunit, "Jy", "units of field", &cStatus);
    484484
    485485    // TCALTIME (additional, real).
    486     fits_insert_col(cSDptr, ++ncol, "TCALTIME",  "16A", &cStatus);
     486    fits_insert_col(cSDptr, ++ncol, (char *)"TCALTIME",  (char *)"16A", &cStatus);
    487487
    488488    // AZIMUTH (shared, real).
    489     fits_insert_col(cSDptr, ++ncol, "AZIMUTH",  "1E", &cStatus);
     489    fits_insert_col(cSDptr, ++ncol, (char *)"AZIMUTH",  (char *)"1E", &cStatus);
    490490    sprintf(tunit, "TUNIT%d", ncol);
    491491    fits_write_key_str(cSDptr, tunit, "deg", "units of field", &cStatus);
    492492
    493493    // ELEVATIO (shared, real).
    494     fits_insert_col(cSDptr, ++ncol, "ELEVATIO", "1E", &cStatus);
     494    fits_insert_col(cSDptr, ++ncol, (char *)"ELEVATIO", (char *)"1E", &cStatus);
    495495    sprintf(tunit, "TUNIT%d", ncol);
    496496    fits_write_key_str(cSDptr, tunit, "deg", "units of field", &cStatus);
    497497
    498498    // PARANGLE (additional, real).
    499     fits_insert_col(cSDptr, ++ncol, "PARANGLE", "1E", &cStatus);
     499    fits_insert_col(cSDptr, ++ncol, (char *)"PARANGLE", (char *)"1E", &cStatus);
    500500    sprintf(tunit, "TUNIT%d", ncol);
    501501    fits_write_key_str(cSDptr, tunit, "deg", "units of field", &cStatus);
    502502
    503503    // FOCUSAXI (additional, real).
    504     fits_insert_col(cSDptr, ++ncol, "FOCUSAXI", "1E", &cStatus);
     504    fits_insert_col(cSDptr, ++ncol, (char *)"FOCUSAXI", (char *)"1E", &cStatus);
    505505    sprintf(tunit, "TUNIT%d", ncol);
    506506    fits_write_key_str(cSDptr, tunit, "m", "units of field", &cStatus);
    507507
    508508    // FOCUSTAN (additional, real).
    509     fits_insert_col(cSDptr, ++ncol, "FOCUSTAN", "1E", &cStatus);
     509    fits_insert_col(cSDptr, ++ncol, (char *)"FOCUSTAN", (char *)"1E", &cStatus);
    510510    sprintf(tunit, "TUNIT%d", ncol);
    511511    fits_write_key_str(cSDptr, tunit, "m", "units of field", &cStatus);
    512512
    513513    // FOCUSROT (additional, real).
    514     fits_insert_col(cSDptr, ++ncol, "FOCUSROT", "1E", &cStatus);
    515     sprintf(tunit, "TUNIT%d", ncol);
    516     fits_write_key_str(cSDptr, tunit, "deg", "units of field", &cStatus);
     514    fits_insert_col(cSDptr, ++ncol, (char *)"FOCUSROT", (char *)"1E", &cStatus);
     515    sprintf(tunit, "TUNIT%d", ncol);
     516    fits_write_key_str(cSDptr, tunit, (char *)"deg", (char *)"units of field", &cStatus);
    517517
    518518    // TAMBIENT (shared, real).
    519     fits_insert_col(cSDptr, ++ncol, "TAMBIENT", "1E", &cStatus);
     519    fits_insert_col(cSDptr, ++ncol, (char *)"TAMBIENT", (char *)"1E", &cStatus);
    520520    sprintf(tunit, "TUNIT%d", ncol);
    521521    fits_write_key_str(cSDptr, tunit, "C", "units of field", &cStatus);
    522522
    523523    // PRESSURE (shared, real).
    524     fits_insert_col(cSDptr, ++ncol, "PRESSURE", "1E", &cStatus);
     524    fits_insert_col(cSDptr, ++ncol, (char *)"PRESSURE", (char *)"1E", &cStatus);
    525525    sprintf(tunit, "TUNIT%d", ncol);
    526526    fits_write_key_str(cSDptr, tunit, "Pa", "units of field", &cStatus);
    527527
    528528    // HUMIDITY (shared, real).
    529     fits_insert_col(cSDptr, ++ncol, "HUMIDITY", "1E", &cStatus);
     529    fits_insert_col(cSDptr, ++ncol, (char *)"HUMIDITY", (char *)"1E", &cStatus);
    530530    sprintf(tunit, "TUNIT%d", ncol);
    531531    fits_write_key_str(cSDptr, tunit, "%", "units of field", &cStatus);
    532532
    533533    // WINDSPEE (shared, real).
    534     fits_insert_col(cSDptr, ++ncol, "WINDSPEE", "1E", &cStatus);
     534    fits_insert_col(cSDptr, ++ncol, (char *)"WINDSPEE", (char *)"1E", &cStatus);
    535535    sprintf(tunit, "TUNIT%d", ncol);
    536536    fits_write_key_str(cSDptr, tunit, "m/s", "units of field", &cStatus);
    537537
    538538    // WINDDIRE (shared, real).
    539     fits_insert_col(cSDptr, ++ncol, "WINDDIRE", "1E", &cStatus);
     539    fits_insert_col(cSDptr, ++ncol, (char *)"WINDDIRE", (char *)"1E", &cStatus);
    540540    sprintf(tunit, "TUNIT%d", ncol);
    541541    fits_write_key_str(cSDptr, tunit, "deg", "units of field", &cStatus);
Note: See TracChangeset for help on using the changeset viewer.