Changeset 14935 for trunk/Mars/mcore


Ignore:
Timestamp:
02/20/13 14:49:37 (12 years ago)
Author:
tbretz
Message:
Add changes necessary to remove fits completely from namespace std in MARS.
Location:
trunk/Mars/mcore
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Mars/mcore/DrsCalib.h

    r14865 r14935  
    55#include <errno.h>  // errno
    66
     7#ifndef MARS_fits
    78#include "fits.h"
     9#endif
     10
     11#ifndef MARS_ofits
    812#include "ofits.h"
     13#endif
    914
    1015#ifdef __MARS__
    … …  
    929934    std::string ReadFitsImp(const std::string &str, std::vector<float> &vec)
    930935    {
     936#ifndef __MARS__
    931937        std::fits file(str);
     938#else
     939        fits file(str);
     940#endif
    932941        if (!file)
    933942        {
    … …  
    10541063        const size_t n = 1440*1024*4 + 1440*fRoi*2 + fNumTm*fRoi*2 + 3;
    10551064
     1065#ifndef __MARS__
    10561066        std::ofits file(filename.c_str());
     1067#else
     1068        ofits file(filename.c_str());
     1069#endif
    10571070        if (!file)
    10581071        {

  • trunk/Mars/mcore/fits.h

    r14933 r14935  
    5757namespace std
    5858{
     59#else
     60using namespace std;
    5961#endif
    6062

  • trunk/Mars/mcore/ofits.h

    r14933 r14935  
    2121namespace std
    2222{
     23#else
     24using namespace std;
    2325#endif
    2426
    … …  
    803805};
    804806
    805 #ifdef __MARS__
     807#ifndef __MARS__
    806808};
    807809#endif
Note: See TracChangeset for help on using the changeset viewer.