Changeset 10039 in ntrip for trunk

Timestamp:

May 10, 2023, 6:01:18 PM (12 months ago)

Author:

stuerze

Message:

revert some changes temporary

Location:

trunk/BNC/src

Files:

• bnccore.cpp (modified) (1 diff)
• combination/bnccomb.cpp (modified) (1 diff)
• combination/bnccomb.h (modified) (3 diffs)

trunk/BNC/src/bnccore.cpp

@@ -758 +758 @@
 //
 ////////////////////////////////////////////////////////////////////////////
-void t_bncCore::initCombination() {
-  _bncComb = bncComb::instance();
+void t_bncCore::initCombination() {//cout << "initCombination" << endl;
+  _bncComb = new bncComb();
   if (_bncComb->nStreams() < 1) {
     delete _bncComb;

trunk/BNC/src/combination/bnccomb.cpp

@@ -115 +115 @@
 
 
-// Define the static Singleton pointer
-////////////////////////////////////////////////////////////////////////////
-bncComb* bncComb::_instPtr = NULL;
-
 // Singleton
 ////////////////////////////////////////////////////////////////////////////
-bncComb* bncComb::instance() {
-  if (_instPtr == NULL) {
-    _instPtr = new bncComb();
-  }
-  return(_instPtr);
+bncComb* bncComb::instance() {//cout << "bncComb::instance()" << endl;
+  static bncComb _bncComb;
+  return &_bncComb;
 }
 
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
-bncComb::bncComb() : _ephUser(true) {
+bncComb::bncComb() : _ephUser(true) {//cout << "bncComb::bncComb()" << endl;
 
   bncSettings settings;

trunk/BNC/src/combination/bnccomb.h

@@ -22 +22 @@
  Q_OBJECT
  public:
+  bncComb();
   virtual ~bncComb();
   static bncComb* instance();
@@ -43 +44 @@
 
  private:
-  static bncComb* _instPtr;   // The one, single instance
-  bncComb();                  // private constructor
+  //bncComb();                  // private constructor
   bncComb(const bncComb&);
   bncComb& operator=(const bncComb&);
@@ -141 +141 @@
     std::vector<t_clkCorr*> _clkCorr;
   };
+
+
 
   class cmbRefSig {