MacOS

Author: an-tao

trantor/net/inner/BufferNode.h

@@ -41,7 +41,7 @@ class BufferNode : public NonCopyable
         return false;
     }
     virtual void getData(const char *&data, size_t &len) = 0;
-    virtual void append(const char *data, size_t len)
+    virtual void append(const char *, size_t)
     {
         LOG_FATAL << "Not a memory buffer node";
     }

trantor/net/inner/FileBufferNodeUnix.cc

@@ -1,4 +1,8 @@
 #include <trantor/net/inner/BufferNode.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <algorithm>
 
 namespace trantor
 {
@@ -25,7 +29,7 @@ class FileBufferNode : public BufferNode
         if (msgBuffer_.readableBytes() == 0)
         {
             msgBuffer_.ensureWritableBytes(
-                std::min(kMaxSendFileBufferSize, fileBytesToSend_));
+                (std::min)(kMaxSendFileBufferSize, fileBytesToSend_));
             auto n = read(sendFd_,
                           msgBuffer_.beginWrite(),
                           msgBuffer_.writableBytes());
@@ -56,7 +60,7 @@ class FileBufferNode : public BufferNode
 
   private:
     int sendFd_{-1};
-    ssize_t fileBytesToSend_{0};
+    size_t fileBytesToSend_{0};
     MsgBuffer msgBuffer_;
 };
 

trantor/net/inner/FileBufferNodeWin.cc

@@ -69,7 +69,7 @@ class FileBufferNode : public BufferNode
     FILE *sendFp_{nullptr};
     long long offset_{0};
 
-    ssize_t fileBytesToSend_{0};
+    size_t fileBytesToSend_{0};
 
     MsgBuffer msgBuffer_;
 };