Changeset 10039 in ntrip
- Timestamp:
- May 10, 2023, 6:01:18 PM (16 months ago)
- Location:
- trunk/BNC/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/BNC/src/bnccore.cpp
r10038 r10039 758 758 // 759 759 //////////////////////////////////////////////////////////////////////////// 760 void t_bncCore::initCombination() { 761 _bncComb = bncComb::instance();760 void t_bncCore::initCombination() {//cout << "initCombination" << endl; 761 _bncComb = new bncComb(); 762 762 if (_bncComb->nStreams() < 1) { 763 763 delete _bncComb; -
trunk/BNC/src/combination/bnccomb.cpp
r10038 r10039 115 115 116 116 117 // Define the static Singleton pointer118 ////////////////////////////////////////////////////////////////////////////119 bncComb* bncComb::_instPtr = NULL;120 121 117 // Singleton 122 118 //////////////////////////////////////////////////////////////////////////// 123 bncComb* bncComb::instance() { 124 if (_instPtr == NULL) { 125 _instPtr = new bncComb(); 126 } 127 return(_instPtr); 119 bncComb* bncComb::instance() {//cout << "bncComb::instance()" << endl; 120 static bncComb _bncComb; 121 return &_bncComb; 128 122 } 129 123 130 124 // Constructor 131 125 //////////////////////////////////////////////////////////////////////////// 132 bncComb::bncComb() : _ephUser(true) { 126 bncComb::bncComb() : _ephUser(true) {//cout << "bncComb::bncComb()" << endl; 133 127 134 128 bncSettings settings; -
trunk/BNC/src/combination/bnccomb.h
r10038 r10039 22 22 Q_OBJECT 23 23 public: 24 bncComb(); 24 25 virtual ~bncComb(); 25 26 static bncComb* instance(); … … 43 44 44 45 private: 45 static bncComb* _instPtr; // The one, single instance 46 bncComb(); // private constructor 46 //bncComb(); // private constructor 47 47 bncComb(const bncComb&); 48 48 bncComb& operator=(const bncComb&); … … 141 141 std::vector<t_clkCorr*> _clkCorr; 142 142 }; 143 144 143 145 144 146 class cmbRefSig {
Note:
See TracChangeset
for help on using the changeset viewer.