Changeset 17141 for trunk


Ignore:
Timestamp:
09/07/13 16:17:07 (11 years ago)
Author:
tbretz
Message:
More inclused to make any include order possible, removed some obsolete cint hacks
Location:
trunk/Mars/mcore
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Mars/mcore/checksum.h

    r17132 r17141  
    55#include <arpa/inet.h>
    66#endif
     7
     8#include <stdint.h>
    79
    810namespace std

  • trunk/Mars/mcore/fits.h

    r17133 r17141  
    22#define MARS_fits
    33
    4 #ifdef __CINT__
    5 #define int8_t   Char_t
    6 #define int16_t  Short_t
    7 #define int32_t  Int_t
    8 #define int64_t  Long64_t
    9 #define uint8_t  UChar_t
    10 #define uint16_t UShort_t
    11 #define uint32_t UInt_t
    12 #define uint64_t ULong64_t
    13 #else
    144#include <stdint.h>
    15 #endif
    165
    176#include <map>
    … …  
    209#include <sstream>
    2110#include <algorithm>
    22 
    23 #ifdef __EXCEPTIONS
    2411#include <stdexcept>
    25 #endif
    2612
    2713#ifdef __CINT__

  • trunk/Mars/mcore/ofits.h

    r17136 r17141  
    1111#include <vector>
    1212#include <algorithm>
    13 
    14 #ifdef __EXCEPTIONS
    1513#include <stdexcept>
     14
     15#ifdef __CINT__
     16#define off_t size_t
     17#endif
     18
     19#ifndef __MARS__
     20#define gLog cerr
     21#define ___err___   ""
     22#define ___warn___  ""
     23#define ___all___   ""
     24#else
     25#include "MLog.h"
     26#include "MLogManip.h"
     27#define ___err___   err
     28#define ___warn___  warn
     29#define ___all___   all
    1630#endif
    1731

  • trunk/Mars/mcore/zfits.h

    r17137 r17141  
    66 */
    77
    8 #ifndef MARS_ZFITS
    9 #define MARS_ZFITS
    10 
    11 #include <stdexcept>
     8#ifndef MARS_zfits
     9#define MARS_zfits
    1210
    1311#include "fits.h"
Note: See TracChangeset for help on using the changeset viewer.