Changeset 7298 in ntrip for trunk/BNC/src/bnccore.cpp


Ignore:
Timestamp:
Sep 22, 2015, 10:44:09 PM (9 years ago)
Author:
stuerze
Message:

some restructuring

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/BNC/src/bnccore.cpp

    r7291 r7298  
    5353#include "rinex/rnxnavfile.h"
    5454#include "pppMain.h"
    55 
    56 #ifdef USE_COMBINATION
    57 #  include "combination/bnccomb.h"
    58 #endif
     55#include "combination/bnccomb.h"
    5956
    6057using namespace std;
    … …  
    7673  _rawFile     = 0;
    7774  _caster      = 0;
    78 #ifdef USE_COMBINATION
    7975  _bncComb     = 0;
    80 #endif
    8176
    8277  // Eph file(s)
    … …  
    145140  delete _dateAndTimeGPS;
    146141  delete _rawFile;
    147 
    148 #ifdef USE_COMBINATION
    149142  delete _bncComb;
    150 #endif
    151143}
    152144
    … …  
    707699////////////////////////////////////////////////////////////////////////////
    708700void t_bncCore::initCombination() {
    709 #ifdef USE_COMBINATION
    710701  _bncComb = new bncComb();
    711702  if (_bncComb->nStreams() < 1) {
    … …  
    713704    _bncComb = 0;
    714705  }
    715 #endif
    716706}
    717707
    … …  
    719709////////////////////////////////////////////////////////////////////////////
    720710void t_bncCore::stopCombination() {
    721 #ifdef USE_COMBINATION
    722711  delete _bncComb;
    723712  _bncComb = 0;
    724 #endif
    725713}
    726714
Note: See TracChangeset for help on using the changeset viewer.