fix compilation errors on mac

Author: treefrogframework

src/corelib.pro

@@ -354,8 +354,6 @@ HEADERS += tactioncontextroutine.h
 SOURCES += tactioncontextroutine.cpp
 # HEADERS += tthreadpool.h
 # SOURCES += tthreadpool.cpp
-HEADERS += tthreadpoolawaiter.h
-SOURCES += tthreadpoolawaiter.cpp
 
 !wasm {
   HEADERS += tsmtpmailer.h
@@ -409,6 +407,8 @@ linux-* {
   SOURCES += turingcoroutine_linux.cpp
   HEADERS += tactionworker.h
   SOURCES += tactionworker.cpp
+  HEADERS += tthreadpoolawaiter.h
+  SOURCES += tthreadpoolawaiter.cpp
 #  HEADERS += tactionroutine.h
 #  SOURCES += tactionroutine.cpp
   HEADERS += tepoll.h

src/tdatabasecontext.cpp

@@ -71,14 +71,14 @@ TSqlDatabase &TDatabaseContext::getSqlDatabase(int id)
     int n = 0;
     do {
         if (!handle || !handle->isValid()) {
-            handle = std::move(TSqlDatabasePool::instance()->database(id));
+            handle = TSqlDatabasePool::instance()->database(id);
         }
 
         if (tx.begin()) {
             break;
         }
 
-        handle = std::move(TSqlDatabase::Handle{});
+        handle = TSqlDatabase::Handle{};
     } while (++n < 2);  // try two times
 
     idleElapsed = (uint)std::time(nullptr);
@@ -102,7 +102,7 @@ TKvsDatabase::Handle &TDatabaseContext::getKvsDatabase(Tf::KvsEngine engine)
 {
     auto &handle = kvsDatabases[(int)engine];
     if (!handle || !handle->isValid()) {
-        handle = std::move(TKvsDatabasePool::instance()->database(engine));
+        handle = TKvsDatabasePool::instance()->database(engine);
     }
 
     idleElapsed = (uint)std::time(nullptr);

src/test/sharedmemorymutex/sharedmemorymutex.cpp

@@ -3,6 +3,7 @@
 #include "tsharedmemorykvs.h"
 #include "tcommandlineinterface.h"
 #include "tglobal.h"
+#include <thread>
 
 
 const QString SHM_NAME = "tfcache.shm";

src/thazardobject.h

@@ -7,12 +7,12 @@ class T_CORE_EXPORT THazardObject {
 public:
     THazardObject();
     THazardObject(const THazardObject &);
-    THazardObject(THazardObject &&) = default;
+    THazardObject &operator=(const THazardObject &) { return *this; }
+    THazardObject(THazardObject &&) = delete;
+    THazardObject &operator=(THazardObject &&) = delete;
     virtual ~THazardObject() { }
 
     void deleteLater();
-    THazardObject &operator=(const THazardObject &) { return *this; }
-    THazardObject &operator=(THazardObject &&) { return *this; }
 
 private:
     THazardObject *next {nullptr};

src/thttprequest.cpp

@@ -87,7 +87,7 @@ THttpRequest::THttpRequest(const THttpRequestHeader &header, const QByteArray &b
 THttpRequest::THttpRequest(const QByteArray &header, const QString &filePath, const QHostAddress &clientAddress, TActionContext *context) :
     d(std::make_unique<THttpRequestData>())
 {
-    d->header = std::move(THttpRequestHeader{header});
+    d->header = THttpRequestHeader{header};
     d->clientAddress = clientAddress;
 
     if (d->header.contentType().trimmed().toLower().startsWith(QByteArrayLiteral("multipart/form-data"))) {

src/tkvsdatabase.cpp

@@ -35,7 +35,7 @@ class TKvsDatabaseDict : public QMap<QString, TKvsDatabaseSettings> {
 
 static TKvsDatabaseDict *databaseDict()
 {
-    static std::unique_ptr<TKvsDatabaseDict> dict{new TKvsDatabaseDict{}};
+    static std::unique_ptr<TKvsDatabaseDict> dict = std::make_unique<TKvsDatabaseDict>();
     return dict.get();
 }
 

src/tmongoquery.h

@@ -10,10 +10,11 @@ class TMongoDriver;
 class T_CORE_EXPORT TMongoQuery {
 public:
     TMongoQuery(const QString &collection);
-    //TMongoQuery(const TMongoQuery &other);
-    TMongoQuery(TMongoQuery &&) = default;
     virtual ~TMongoQuery() { }
-    TMongoQuery &operator=(TMongoQuery &&) = default;
+    TMongoQuery(const TMongoQuery &) = delete;
+    TMongoQuery &operator=(const TMongoQuery &) = delete;
+    TMongoQuery(TMongoQuery &&) = delete;
+    TMongoQuery &operator=(TMongoQuery &&) = delete;
 
     int limit() const;
     void setLimit(int limit);
@@ -35,8 +36,6 @@ class T_CORE_EXPORT TMongoQuery {
     int count(const QVariantMap &criteria = QVariantMap());
     QString lastErrorString() const;
 
-    //TMongoQuery &operator=(const TMongoQuery &other);
-
 private:
     TMongoDriver *driver();
     const TMongoDriver *driver() const;
@@ -50,7 +49,6 @@ class T_CORE_EXPORT TMongoQuery {
     int _queryOffset {0};
 
     friend class TCacheMongoStore;
-    T_DISABLE_COPY(TMongoQuery)
 };
 
 

src/tthreadapplicationserver.cpp

@@ -17,7 +17,7 @@
   an web application server for thread.
 */
 
-TLockStack<TActionThread *> &TThreadApplicationServer::threadPoolPtr()
+TLockStack<TActionThread *> &TThreadApplicationServer::threadPool()
 {
     static TLockStack<TActionThread *> threadPool;
     return threadPool;

src/tthreadapplicationserver.h

@@ -19,13 +19,14 @@ class T_CORE_EXPORT TThreadApplicationServer : public QTcpServer, public TApplic
     void stop() override;
     void setAutoReloadingEnabled(bool enable) override;
     bool isAutoReloadingEnabled() override;
+    static TThreadApplicationServer *instance(int listeningSocket = 0, QObject *parent = nullptr);
 
 protected:
     void incomingConnection(qintptr socketDescriptor) override;
     void timerEvent(QTimerEvent *event) override;
 
 private:
-    static TLockStack<TActionThread *> *threadPoolPtr();
+    static TLockStack<TActionThread *> &threadPool();
 
     int listenSocket {0};
     int maxThreads {0};
@@ -44,15 +45,15 @@ class T_CORE_EXPORT TThreadApplicationServer : public QThread, public TApplicati
     void stop() override;
     void setAutoReloadingEnabled(bool enable) override;
     bool isAutoReloadingEnabled() override;
-    static TThreadApplicationServer *instance(int listeningSocket = 0,QObject *parent = nullptr);
+    static TThreadApplicationServer *instance(int listeningSocket = 0, QObject *parent = nullptr);
 
 protected:
     void incomingConnection(qintptr socketDescriptor);
     void timerEvent(QTimerEvent *event) override;
     void run() override;
 
 private:
-    static TLockStack<TActionThread *> &threadPoolPtr();
+    static TLockStack<TActionThread *> &threadPool();
     TThreadApplicationServer(int listeningSocket, QObject *parent = nullptr);
 
     int listenSocket {0};

src/tthreadapplicationserver_linux.cpp

@@ -33,9 +33,9 @@ TThreadApplicationServer::TThreadApplicationServer(int listeningSocket, QObject
     for (int i = 0; i < maxThreads; i++) {
         TActionThread *thread = new TActionThread(0);
         connect(thread, &TActionThread::finished, [=]() {
-            threadPoolPtr().push(thread);
+            threadPool().push(thread);
         });
-        threadPoolPtr().push(thread);
+        threadPool().push(thread);
     }
 }
 
@@ -110,7 +110,7 @@ void TThreadApplicationServer::run()
                 tSystemDebug("incomingConnection  sd:{}  thread count:{}  max:{}", socketDescriptor, TActionThread::threadCount(), maxThreads);
                 std::optional<TActionThread*> thread;
 
-                while (!(thread = threadPoolPtr().pop())) {
+                while (!(thread = threadPool().pop())) {
                     std::this_thread::yield();
                     Tf::msleep(1);
                 }