Optimized some copy operations.

awwit · awwit · commit 0e8c8dd92569 · 2018-04-02T21:34:19.000+03:00
Added copy constructor for FileIncoming.
diff --git a/src/server/protocol/ServerHttp2.cpp b/src/server/protocol/ServerHttp2.cpp
@@ -590,9 +590,9 @@ namespace HttpServer
 			}
 		} else {
 			std::copy(
-				buf.cbegin() + length,
-				buf.cbegin() + read_size,
-				buf.begin()
+				buf.data() + length,
+				buf.data() + read_size,
+				buf.data()
 			);
 
 			read_size -= length;
diff --git a/src/server/protocol/ServerHttp2Protocol.cpp b/src/server/protocol/ServerHttp2Protocol.cpp
@@ -106,7 +106,9 @@ namespace HttpServer
 				}
 			}
 
-			const size_t frame_size = data_size + padding_size;
+			const uint32_t frame_size = static_cast<uint32_t>(
+				data_size + padding_size
+			);
 
 			buf.resize(frame_size + Http2::FRAME_HEADER_SIZE);
 
@@ -141,15 +143,15 @@ namespace HttpServer
 
 			this->stream->setHttp2FrameHeader(
 				buf.data(),
-				static_cast<uint32_t>(frame_size),
+				frame_size,
 				Http2::FrameType::DATA,
 				flags
 			);
 
 			std::copy(
 				data,
 				data + data_size,
-				buf.begin() + long(cur)
+				buf.data() + cur
 			);
 
 			if (padding) {
diff --git a/src/transfer/FileIncoming.h b/src/transfer/FileIncoming.h
@@ -14,10 +14,9 @@ namespace Transfer
 		std::string file_type;
 		size_t file_size;
 
-	private:
-		FileIncoming() = delete;
-
 	public:
+		FileIncoming() = default;
+
 		FileIncoming(
 			std::string &&fileTmpName,
 			std::string &&fileName,
@@ -30,6 +29,8 @@ namespace Transfer
 
 		~FileIncoming() noexcept = default;
 
+		FileIncoming &operator =(const FileIncoming &) = default;
+
 		const std::string &getTmpName() const noexcept;
 		const std::string &getName() const noexcept;
 		const std::string &getType() const noexcept;
