Changeset 10039 in ntrip


Ignore:
Timestamp:
May 10, 2023, 6:01:18 PM (14 months ago)
Author:
stuerze
Message:

revert some changes temporary

Location:
trunk/BNC/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/bnccore.cpp

    r10038 r10039  
    758758//
    759759////////////////////////////////////////////////////////////////////////////
    760 void t_bncCore::initCombination() {
    761   _bncComb = bncComb::instance();
     760void t_bncCore::initCombination() {//cout << "initCombination" << endl;
     761  _bncComb = new bncComb();
    762762  if (_bncComb->nStreams() < 1) {
    763763    delete _bncComb;
  • trunk/BNC/src/combination/bnccomb.cpp

    r10038 r10039  
    115115
    116116
    117 // Define the static Singleton pointer
    118 ////////////////////////////////////////////////////////////////////////////
    119 bncComb* bncComb::_instPtr = NULL;
    120 
    121117// Singleton
    122118////////////////////////////////////////////////////////////////////////////
    123 bncComb* bncComb::instance() {
    124   if (_instPtr == NULL) {
    125     _instPtr = new bncComb();
    126   }
    127   return(_instPtr);
     119bncComb* bncComb::instance() {//cout << "bncComb::instance()" << endl;
     120  static bncComb _bncComb;
     121  return &_bncComb;
    128122}
    129123
    130124// Constructor
    131125////////////////////////////////////////////////////////////////////////////
    132 bncComb::bncComb() : _ephUser(true) {
     126bncComb::bncComb() : _ephUser(true) {//cout << "bncComb::bncComb()" << endl;
    133127
    134128  bncSettings settings;
  • trunk/BNC/src/combination/bnccomb.h

    r10038 r10039  
    2222 Q_OBJECT
    2323 public:
     24  bncComb();
    2425  virtual ~bncComb();
    2526  static bncComb* instance();
     
    4344
    4445 private:
    45   static bncComb* _instPtr;   // The one, single instance
    46   bncComb();                  // private constructor
     46  //bncComb();                  // private constructor
    4747  bncComb(const bncComb&);
    4848  bncComb& operator=(const bncComb&);
     
    141141    std::vector<t_clkCorr*> _clkCorr;
    142142  };
     143
     144
    143145
    144146  class cmbRefSig {
Note: See TracChangeset for help on using the changeset viewer.