Changeset 10040 in ntrip for trunk/BNC/src/combination

Timestamp:

May 11, 2023, 2:23:16 PM (21 months ago)

Author:

stuerze

Message:

minor changes

Location:

trunk/BNC/src/combination

Files:

• bnccomb.cpp (modified) (1 diff)
• bnccomb.h (modified) (4 diffs)

trunk/BNC/src/combination/bnccomb.cpp

@@ -114 +114 @@
 }
 
-
-// Singleton
-////////////////////////////////////////////////////////////////////////////
-bncComb* bncComb::instance() {//cout << "bncComb::instance()" << endl;
-  static bncComb _bncComb;
-  return &_bncComb;
-}
+// Singleton: definition class variable
+////////////////////////////////////////////////////////////////////////////
+bncComb* bncComb::instance = nullptr; 
+
 
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
-bncComb::bncComb() : _ephUser(true) {//cout << "bncComb::bncComb()" << endl;
+bncComb::bncComb() : _ephUser(true) {
 
   bncSettings settings;

trunk/BNC/src/combination/bnccomb.h

@@ -22 +22 @@
  Q_OBJECT
  public:
-  bncComb();
-  virtual ~bncComb();
-  static bncComb* instance();
+  static bncComb* getInstance() {
+    if (instance == 0) {
+      instance = new bncComb;
+    }
+    return instance;
+  }
+  bncComb(const bncComb&) = delete;
+  bncComb& operator=(const bncComb&) = delete;
+  static void destruct() {
+    delete instance;
+    instance = nullptr;
+  }
   int  nStreams() const {return _ACs.size();}
 
@@ -33 +42 @@
   void slotNewCodeBiases(QList<t_satCodeBias> satCodeBiases);
 
-
  private slots:
   void slotReadBiasSnxFile();
@@ -44 +52 @@
 
  private:
-  //bncComb();                  // private constructor
-  bncComb(const bncComb&);
-  bncComb& operator=(const bncComb&);
-
+  bncComb();                // no public constructor
+  ~bncComb();               // no public destructor
+  static bncComb* instance; // declaration class variable
   enum e_method{singleEpoch, filter};
 
@@ -267 +274 @@
 };
 
-#define BNC_CMB (bncComb::instance())
+#define BNC_CMB (bncComb::getInstance())
 
 #endif